fix(dev): pass a proper image name when building

go-faster · Jun 19, 2024 · 878b7f6 · 878b7f6
1 parent 63d275c
commit 878b7f6
Show file tree

Hide file tree

Showing 13 changed files with 109 additions and 89 deletions.
diff --git a/dev/local/ch-bench-read/docker-compose.ci.yml b/dev/local/ch-bench-read/docker-compose.ci.yml
@@ -12,20 +12,21 @@ services:
     volumes:
       - ./clickhouse.xml:/etc/clickhouse-server/config.d/monitoring.xml
     healthcheck:
-      test: ['CMD', 'wget', '--spider', '-q', '127.0.0.1:8123/ping']
+      test: ["CMD", "wget", "--spider", "-q", "127.0.0.1:8123/ping"]
       interval: 1s
       timeout: 1s
       retries: 30
 
   prometheus:
     image: "ghcr.io/go-faster/prom/prometheus"
     command:
-      - '--config.file=/etc/prometheus/prometheus.yml'
+      - "--config.file=/etc/prometheus/prometheus.yml"
     volumes:
-      - './prometheus.yml:/etc/prometheus/prometheus.yml'
+      - "./prometheus.yml:/etc/prometheus/prometheus.yml"
     restart: unless-stopped
 
   oteldb:
+    image: ghcr.io/go-faster/oteldb
     build:
       context: ../../../
       dockerfile: deploy.Dockerfile
@@ -49,23 +50,24 @@ services:
       - GOMAXPROCS=3
       - GOMEMLIMIT=1GiB
     healthcheck:
-      test: ['CMD', 'wget', '--spider', '-q', '127.0.0.1:13133/liveness']
+      test: ["CMD", "wget", "--spider", "-q", "127.0.0.1:13133/liveness"]
       interval: 1s
       timeout: 1s
       retries: 30
     ports:
-      - "127.0.0.1:9090:9090"   # promql
-      - "127.0.0.1:9010:9010"   # pprof
+      - "127.0.0.1:9090:9090" # promql
+      - "127.0.0.1:9010:9010" # pprof
       - "127.0.0.1:19291:19291" # prometheus remote write
     depends_on:
       - clickhouse
 
   # Exports traces from clickhouse internal table to otel.
   chotel:
-    restart: always
+    image: ghcr.io/go-faster/oteldb/chotel
     build:
       context: ../../../
       dockerfile: deploy.chotel.Dockerfile
+    restart: always
     environment:
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://otelcol:4317
       - OTEL_EXPORTER_OTLP_PROTOCOL=grpc
@@ -77,7 +79,7 @@ services:
 
   tempo:
     image: "ghcr.io/go-faster/tempo"
-    command: [ "-config.file=/etc/tempo.yml" ]
+    command: ["-config.file=/etc/tempo.yml"]
     ports:
       - "127.0.0.1:3200:3200"
     volumes:
@@ -91,5 +93,5 @@ services:
     ports:
       - "127.0.0.1:4317:4317"
     command:
-      - '--config'
-      - '/etc/otelcol-contrib/config.yaml'
+      - "--config"
+      - "/etc/otelcol-contrib/config.yaml"
diff --git a/dev/local/ch-bench-read/docker-compose.yml b/dev/local/ch-bench-read/docker-compose.yml
@@ -26,6 +26,7 @@ services:
     restart: unless-stopped
 
   oteldb:
+    image: ghcr.io/go-faster/oteldb
     build:
       context: ../../../
       dockerfile: Dockerfile
@@ -62,10 +63,11 @@ services:
 
   # Exports traces from clickhouse internal table to otel.
   chotel:
-    restart: always
+    image: ghcr.io/go-faster/oteldb/chotel
     build:
       context: ../../../
       dockerfile: chotel.Dockerfile
+    restart: always
     environment:
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://otelcol:4317
       - OTEL_EXPORTER_OTLP_PROTOCOL=grpc

diff --git a/dev/local/ch-bench/docker-compose.yml b/dev/local/ch-bench/docker-compose.yml
@@ -9,12 +9,13 @@ services:
     volumes:
       - ./clickhouse.xml:/etc/clickhouse-server/config.d/monitoring.xml
     healthcheck:
-      test: ['CMD', 'wget', '--spider', '-q', '127.0.0.1:8123/ping']
+      test: ["CMD", "wget", "--spider", "-q", "127.0.0.1:8123/ping"]
       interval: 1s
       timeout: 1s
       retries: 30
 
   generator:
+    image: ghcr.io/go-faster/oteldb/otelbench
     build:
       context: ../../../
       dockerfile: otelbench.Dockerfile
@@ -41,6 +42,7 @@ services:
       - oteldb
 
   oteldb:
+    image: ghcr.io/go-faster/oteldb
     build:
       context: ../../../
       dockerfile: Dockerfile
@@ -56,7 +58,7 @@ services:
       - GOMAXPROCS=6
       - GOMEMLIMIT=3GiB
     ports:
-      - "127.0.0.1:9010:9010"   # pprof http://localhost:9010/debug/pprof/
+      - "127.0.0.1:9010:9010" # pprof http://localhost:9010/debug/pprof/
     depends_on:
       - clickhouse
 

diff --git a/dev/local/ch-compliance/docker-compose.ci.yml b/dev/local/ch-compliance/docker-compose.ci.yml
@@ -9,13 +9,13 @@ services:
     volumes:
       - ./clickhouse.xml:/etc/clickhouse-server/config.d/monitoring.xml
     healthcheck:
-      test: ['CMD', 'wget', '--spider', '-q', '127.0.0.1:8123/ping']
+      test: ["CMD", "wget", "--spider", "-q", "127.0.0.1:8123/ping"]
       interval: 1s
       timeout: 1s
       retries: 30
 
   oteldb:
-    image: ghcr.io/go-fater/oteldb
+    image: ghcr.io/go-faster/oteldb
     build:
       context: ../../../
       dockerfile: deploy.Dockerfile
@@ -35,9 +35,9 @@ services:
   prometheus:
     image: "ghcr.io/go-faster/prom/prometheus"
     command:
-      - '--config.file=/etc/prometheus/prometheus.yml'
+      - "--config.file=/etc/prometheus/prometheus.yml"
     volumes:
-      - './prometheus.yml:/etc/prometheus/prometheus.yml'
+      - "./prometheus.yml:/etc/prometheus/prometheus.yml"
     ports:
       - "9091:9090"
     restart: unless-stopped
@@ -48,4 +48,3 @@ services:
     image: "ghcr.io/go-faster/prometheus-demo-service"
   demo-3:
     image: "ghcr.io/go-faster/prometheus-demo-service"
-
diff --git a/dev/local/ch-compliance/docker-compose.yml b/dev/local/ch-compliance/docker-compose.yml
@@ -9,13 +9,13 @@ services:
     volumes:
       - ./clickhouse.xml:/etc/clickhouse-server/config.d/monitoring.xml
     healthcheck:
-      test: ['CMD', 'wget', '--spider', '-q', '127.0.0.1:8123/ping']
+      test: ["CMD", "wget", "--spider", "-q", "127.0.0.1:8123/ping"]
       interval: 1s
       timeout: 1s
       retries: 30
 
   oteldb:
-    image: ghcr.io/go-fater/oteldb
+    image: ghcr.io/go-faster/oteldb
     build:
       context: ../../../
       dockerfile: Dockerfile
@@ -35,9 +35,9 @@ services:
   prometheus:
     image: "prom/prometheus"
     command:
-      - '--config.file=/etc/prometheus/prometheus.yml'
+      - "--config.file=/etc/prometheus/prometheus.yml"
     volumes:
-      - './prometheus.yml:/etc/prometheus/prometheus.yml'
+      - "./prometheus.yml:/etc/prometheus/prometheus.yml"
     ports:
       - "9091:9090"
     restart: unless-stopped

diff --git a/dev/local/ch-demo/docker-compose.yml b/dev/local/ch-demo/docker-compose.yml
@@ -12,17 +12,18 @@ services:
     volumes:
       - ../clickhouse.xml:/etc/clickhouse-server/config.d/monitoring.xml
     healthcheck:
-      test: ['CMD', 'wget', '--spider', '-q', '127.0.0.1:8123/ping']
+      test: ["CMD", "wget", "--spider", "-q", "127.0.0.1:8123/ping"]
       interval: 1s
       timeout: 1s
       retries: 30
 
   # Exports traces from clickhouse internal table to otel.
   chotel:
-    restart: always
+    image: ghcr.io/go-faster/oteldb/chotel
     build:
       context: ../../../
       dockerfile: chotel.Dockerfile
+    restart: always
     environment:
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://otelcol:4317
       - OTEL_EXPORTER_OTLP_PROTOCOL=grpc
@@ -34,10 +35,11 @@ services:
       - clickhouse
 
   client:
-    restart: always
+    image: ghcr.io/go-faster/oteldb/oteldemo
     build:
       context: ../../../
       dockerfile: oteldemo.Dockerfile
+    restart: always
     command: ["client"]
     environment:
       - OTEL_LOG_LEVEL=debug
@@ -49,11 +51,12 @@ services:
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://otelcol:4317
       - OTEL_RESOURCE_ATTRIBUTES=service.name=client
   server:
-    restart: always
+    image: ghcr.io/go-faster/oteldb/oteldemo
     command: ["server"]
     build:
       context: ../../../
       dockerfile: oteldemo.Dockerfile
+    restart: always
     environment:
       - OTEL_LOG_LEVEL=debug
       - OTEL_METRICS_EXPORTER=otlp
@@ -65,6 +68,7 @@ services:
       - OTEL_RESOURCE_ATTRIBUTES=service.name=server
 
   oteldb:
+    image: ghcr.io/go-faster/oteldb
     build:
       context: ../../../
       dockerfile: Dockerfile
@@ -80,7 +84,7 @@ services:
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://otelcol:4317
       - OTEL_RESOURCE_ATTRIBUTES=service.name=oteldb
     ports:
-      - "9090:9090"   # prometheus API
+      - "9090:9090" # prometheus API
     depends_on:
       - clickhouse
 
@@ -96,11 +100,11 @@ services:
       - OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=grpc
       - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4317
     command:
-      - '--config'
-      - '/etc/otelcol-contrib/config.yaml'
+      - "--config"
+      - "/etc/otelcol-contrib/config.yaml"
       #  https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/observability.md#how-we-expose-telemetry
-      - '--feature-gates=telemetry.useOtelForInternalMetrics'
-      - '--feature-gates=telemetry.useOtelWithSDKConfigurationForInternalTelemetry'
+      - "--feature-gates=telemetry.useOtelForInternalMetrics"
+      - "--feature-gates=telemetry.useOtelWithSDKConfigurationForInternalTelemetry"
 
   node-exporter:
     image: prom/node-exporter
@@ -110,12 +114,12 @@ services:
       - /sys:/host/sys:ro
       - /:/rootfs:ro
     command:
-      - '--path.procfs=/host/proc'
-      - '--path.rootfs=/rootfs'
-      - '--path.sysfs=/host/sys'
-      - '--collector.processes'
-      - '--web.max-requests=40'
-      - '--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)'
+      - "--path.procfs=/host/proc"
+      - "--path.rootfs=/rootfs"
+      - "--path.sysfs=/host/sys"
+      - "--collector.processes"
+      - "--web.max-requests=40"
+      - "--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)"
 
   grafana:
     image: "ghcr.io/go-faster/grafana:10.0.0"

diff --git a/dev/local/ch-full/docker-compose.yml b/dev/local/ch-full/docker-compose.yml
@@ -13,17 +13,18 @@ services:
     volumes:
       - ../clickhouse.xml:/etc/clickhouse-server/config.d/monitoring.xml
     healthcheck:
-      test: ['CMD', 'wget', '--spider', '-q', '127.0.0.1:8123/ping']
+      test: ["CMD", "wget", "--spider", "-q", "127.0.0.1:8123/ping"]
       interval: 1s
       timeout: 1s
       retries: 30
 
   # Exports traces from clickhouse internal table to otel.
   chotel:
-    restart: always
+    image: ghcr.io/go-faster/oteldb/chotel
     build:
       context: ../../../
       dockerfile: chotel.Dockerfile
+    restart: always
     environment:
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://otelcol:4317
       - OTEL_EXPORTER_OTLP_PROTOCOL=grpc
@@ -33,6 +34,7 @@ services:
       - clickhouse
 
   oteldb:
+    image: ghcr.io/go-faster/oteldb
     build:
       context: ../../../
       dockerfile: Dockerfile
@@ -47,7 +49,7 @@ services:
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://otelcol:4317
       - OTEL_RESOURCE_ATTRIBUTES=service.name=go-faster.oteldb
     ports:
-      - "9090:9090"   # prometheus API
+      - "9090:9090" # prometheus API
     depends_on:
       - clickhouse
 
@@ -65,8 +67,8 @@ services:
   prometheus:
     image: "ghcr.io/go-faster/prom/prometheus"
     command:
-      - '--config.file=/etc/prometheus/prometheus.yml'
-      - '--web.enable-remote-write-receiver'
+      - "--config.file=/etc/prometheus/prometheus.yml"
+      - "--web.enable-remote-write-receiver"
     ports:
       - "9091:9090"
     restart: unless-stopped
@@ -102,11 +104,11 @@ services:
       - OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=grpc
       - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://otelcol:4317
     command:
-      - '--config'
-      - '/etc/otelcol-contrib/config.yaml'
+      - "--config"
+      - "/etc/otelcol-contrib/config.yaml"
       #  https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/observability.md#how-we-expose-telemetry
-      - '--feature-gates=telemetry.useOtelForInternalMetrics'
-      - '--feature-gates=telemetry.useOtelWithSDKConfigurationForInternalTelemetry'
+      - "--feature-gates=telemetry.useOtelForInternalMetrics"
+      - "--feature-gates=telemetry.useOtelWithSDKConfigurationForInternalTelemetry"
 
   # to produce some metrics
   node-exporter:
@@ -117,20 +119,20 @@ services:
       - /sys:/host/sys:ro
       - /:/rootfs:ro
     command:
-      - '--path.procfs=/host/proc'
-      - '--path.rootfs=/rootfs'
-      - '--path.sysfs=/host/sys'
-      - '--collector.processes'
-      - '--web.max-requests=40'
-      - '--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)'
+      - "--path.procfs=/host/proc"
+      - "--path.rootfs=/rootfs"
+      - "--path.sysfs=/host/sys"
+      - "--collector.processes"
+      - "--web.max-requests=40"
+      - "--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)"
 
   # for compatibility testing
   jaeger:
     image: jaegertracing/all-in-one:latest
 
   tempo:
     image: "ghcr.io/go-faster/tempo"
-    command: [ "-config.file=/etc/tempo.yml" ]
+    command: ["-config.file=/etc/tempo.yml"]
     volumes:
       - ./tempo.yml:/etc/tempo.yml
       - tempo:/tmp/tempo
@@ -162,7 +164,7 @@ services:
   flog:
     image: mingrammer/flog:0.4.3
     # Output fake log in JSON format
-    command: [ "--format=json", "--loop", "--delay=100ms"]
+    command: ["--format=json", "--loop", "--delay=100ms"]
     depends_on: [otelcol]
     logging:
       driver: fluentd