Skip to content

Commit 72f2254

Browse files
reachfhreachfh
committed
Sync images
1 parent 9c4c933 commit 72f2254

4 files changed

Lines changed: 50 additions & 26 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ env:
4949
# Registry for public images, blank for docker.io
5050
PUBLIC_REGISTRY: ''
5151
# PUBLIC_REGISTRY: 'ghcr.io/'
52-
# POSTGRES_REPO_ORG: 'cogini'
53-
# RABBITMQ_REPO_ORG: 'cogini/'
54-
# AWS_OTEL_COLLECTOR_REPO_ORG: 'cogini'
52+
POSTGRES_REPO_ORG: 'cogini'
53+
RABBITMQ_REPO_ORG: 'cogini/'
54+
AWS_OTEL_COLLECTOR_REPO_ORG: 'cogini'
5555
# Git "main" branch. This might be "master" for old repos
5656
MAIN_BRANCH: main
5757
# GitHub Environment secrets and variables

‎deploy/aws-otel-collector.Dockerfile‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
# Docker registry for internal images, e.g. 123.dkr.ecr.ap-northeast-1.amazonaws.com/
1+
# Docker registry for internal images, e.g., 123.dkr.ecr.ap-northeast-1.amazonaws.com/
22
# If blank, docker.io will be used. If specified, should have a trailing slash.
33
ARG REGISTRY=""
44
# Registry for public images such as debian, alpine, or postgres.
5-
ARG PUBLIC_REGISTRY="public.ecr.aws/"
5+
# ARG PUBLIC_REGISTRY="public.ecr.aws/"
6+
ARG PUBLIC_REGISTRY=""
67

78
# Public images may be mirrored into the private registry, with e.g. Skopeo
89
# ARG PUBLIC_REGISTRY=$REGISTRY
910

1011
ARG AWS_REGION=us-east-1
1112

12-
ARG BASE_IMAGE_NAME=${PUBLIC_REGISTRY}aws-observability/aws-otel-collector
13-
ARG BASE_IMAGE_TAG=latest
13+
# ARG BASE_IMAGE_TAG=latest
14+
ARG BASE_IMAGE_TAG=v0.47.0
15+
16+
# FROM ${PUBLIC_REGISTRY}aws-observability/aws-otel-collector:${BASE_IMAGE_TAG}
17+
FROM ${PUBLIC_REGISTRY}${AWS_OTEL_COLLECTOR_REPO_ORG:-amazon}/aws-otel-collector:${BASE_IMAGE_TAG}
1418

15-
FROM ${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG}
1619
ARG AWS_REGION
1720

1821
ENV AWS_REGION=${AWS_REGION}

‎deploy/regsync-ghcr.yml‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# https://regclient.org/usage/regsync/
22
sync:
33
# Build base image
4-
- source: docker.io/hexpm/elixir:1.15.8-erlang-26.0.2-debian-bookworm-20250811-slim
5-
target: ghcr.io/cogini/elixir:1.15.8-erlang-26.0.2-debian-bookworm-20250811-slim
4+
- source: docker.io/hexpm/elixir:1.19.5-erlang-28.4.1-debian-trixie-20260316-slim
5+
- source: ghcr.io/cogini/elixir:1.19.5-erlang-28.4.1-debian-trixie-20260316-slim
66
type: image
77
# Build aws-otel-collector base image
88
- source: docker.io/amazon/aws-otel-collector:latest
@@ -12,22 +12,26 @@ sync:
1212
target: ghcr.io/cogini/aws-otel-collector:v0.47.0
1313
type: image
1414
# Deploy base image
15-
- source: docker.io/debian:bookworm-slim
16-
target: ghcr.io/cogini/debian:bookworm-slim
15+
- source: docker.io/debian:trixie-slim
16+
target: ghcr.io/cogini/debian:trixie-slim
1717
type: image
18-
- source: docker.io/debian:bookworm-20250811-slim
19-
target: ghcr.io/cogini/debian:bookworm-20250811-slim
20-
type: image
21-
- source: docker.io/debian:bookworm-20260223-slim
22-
target: ghcr.io/cogini/debian:bookworm-20260223-slim
18+
- source: docker.io/debian:trixie-20260316-slim
19+
target: ghcr.io/cogini/debian:trixie-20260316-slim
2320
type: image
2421
# Test deps
25-
- source: docker.io/ankane/pgvector:latest
22+
# https://hub.docker.com/_/postgres
23+
- source: docker.io/postgres:latest
2624
target: ghcr.io/cogini/pgvector:latest
2725
type: image
28-
- source: docker.io/ankane/pgvector:v0.5.1
29-
target: ghcr.io/cogini/pgvector:v0.5.1
26+
- source: docker.io/postgres:18.3-alpine
27+
target: ghcr.io/cogini/postgres:18.3-alpine
3028
type: image
29+
# - source: docker.io/ankane/pgvector:latest
30+
# target: ghcr.io/cogini/pgvector:latest
31+
# type: image
32+
# - source: docker.io/ankane/pgvector:v0.5.1
33+
# target: ghcr.io/cogini/pgvector:v0.5.1
34+
# type: image
3135
# TODO: should use newer version from pgvector/pgvector instead of ankane/pgvector
3236
# https://hub.docker.com/r/pgvector/pgvector/tags
3337
- source: docker.io/rabbitmq:3-management

‎docker-compose.gha.yml‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ services:
2323
- DATABASE_HOST=${DATABASE_HOST:-postgres}
2424
- SECRET_KEY_BASE=${SECRET_KEY_BASE:-0cSFk8v5IsZIIGCjY+X66l5xULUl/2mczI4Eqf7slpyns5nBkhegDn6YH9th+5D2}
2525
- OTEL_DEBUG=${OTEL_DEBUG:-false}
26+
# - LOGGER_LEVEL=${LOGGER_LEVEL:-info}
2627
# - MQ_CONN=${MQ_CONN:-amqp://guest:guest@rabbitmq:5672}
2728
volumes:
2829
- "./.cache:/var/cache"
@@ -31,6 +32,8 @@ services:
3132
depends_on:
3233
postgres:
3334
condition: service_healthy
35+
# rabbitmq:
36+
# condition: service_healthy
3437

3538
prod-release:
3639
image: "${REGISTRY:-docker.io/}${IMAGE_OWNER}/${IMAGE_NAME}:${VAR}${IMAGE_VER:-prod-release}"
@@ -62,15 +65,19 @@ services:
6265
# - oban_key_fingerprint
6366
context: .
6467
environment:
65-
# # Use minio container for S3
68+
# Use minio container for S3
6669
# - AWS_S3_HOST=${AWS_S3_HOST:-minio}
6770
# - AWS_S3_PORT=${AWS_S3_PORT:-9000}
6871
# - AWS_S3_SCHEME=${AWS_S3_SCHEME:-http}
69-
# Talk to postgres database container
72+
# Talk to postgres running in container
7073
- DATABASE_URL=${DATABASE_URL:-ecto://postgres:postgres@postgres:5432/postgres}
7174
# - DATABASE_HOST=${DATABASE_HOST:-postgres}
75+
# Run database migrations on startup
76+
- DB_MIGRATE=${DB_MIGRATE:-true}
7277
- LOG_CONSOLE=${LOG_CONSOLE:-true}
7378
- LOG_LEVEL=${LOG_LEVEL:-info}
79+
# - LOGGER_FORMAT=${LOGGER_FORMAT:-text} # default is json
80+
# - LOGGER_LEVEL=${LOGGER_LEVEL:-info}
7481
# Use rabbitmq running in container
7582
# - MQ_CONN=${MQ_CONN:-amqp://guest:guest@rabbitmq:5672}
7683
# - MQ_PASSWORD=${MQ_PASSWORD:-guest}
@@ -169,8 +176,8 @@ services:
169176
- "4318:4318" # OTLP over HTTP
170177
- "55680:55680" # OTLP over gRPC (legacy)
171178
- "55681:55681" # OTLP over HTTP (legacy)
172-
- "8888:8888" # Prometheus metrics exposed by the collector
173-
- "8889:8889" # Prometheus exporter metrics
179+
- "9888:9888" # Prometheus metrics exposed by the collector
180+
- "9889:9889" # Prometheus exporter metrics
174181
- "13133:13133" # health_check extension
175182
- "55679:55679" # zpages extension
176183
# command: ["--config=/etc/otel-collector-config.yml"]
@@ -181,7 +188,8 @@ services:
181188
timeout: 6s
182189
retries: 5
183190
volumes:
184-
- ./otel/aws-collector-config.yml:/etc/otel-collector-config.yml
191+
# - ./otel/aws-collector-config.yml:/etc/otel-collector-config.yml
192+
- ./otel/docker-compose-collector-config.yml:/etc/otel-collector-config.yml
185193
- ./otel/extraconfig.txt:/opt/aws/aws-otel-collector/etc/extracfg.txt
186194

187195
# https://opentelemetry.io/docs/collector/getting-started/#docker-compose
@@ -204,6 +212,13 @@ services:
204212
# depends_on:
205213
# - jaeger
206214

215+
chromic-pdf:
216+
image: "${PUBLIC_REGISTRY:-docker.io/}zenika/alpine-chrome:${CHROME_TAG:-119}"
217+
ports:
218+
- 9222:9222
219+
hostname: chromic-pdf
220+
command: [chromium-browser, "--headless", "--disable-gpu", "--no-sandbox", "--remote-debugging-address=0.0.0.0", "--remote-debugging-port=9222"]
221+
207222
# https://docs.datadoghq.com/getting_started/agent/
208223
# https://github.com/DataDog/datadog-agent/blob/main/pkg/config/config_template.yaml
209224
datadog:
@@ -341,9 +356,11 @@ services:
341356

342357
# https://github.com/docker-library/docs/blob/master/postgres/README.md
343358
# https://geshan.com.np/blog/2021/12/docker-postgres/
359+
# https://hub.docker.com/_/postgres
344360
postgres:
345361
# image: "${PUBLIC_REGISTRY:-docker.io/}${POSTGRES_REPO_ORG:-ankane}/pgvector:${PGVECTOR_TAG:-v0.5.1}"
346-
image: "${PUBLIC_REGISTRY:-docker.io/}postgres:14.6-alpine"
362+
# image: "${PUBLIC_REGISTRY:-docker.io/}postgres:14.6-alpine"
363+
image: "${PUBLIC_REGISTRY:-docker.io/}postgres:18.3-alpine"
347364
# build:
348365
# context: .
349366
# dockerfile: deploy/postgres.Dockerfile

0 commit comments

Comments
 (0)