Review docker-compose.yaml

Signed-off-by: Federico Busetti <[email protected]>

Author: febus982

docker-compose.yaml

@@ -1,37 +1,4 @@
 services:
-  otel-collector:
-    image: otel/opentelemetry-collector-contrib
-    volumes:
-      - ./otel-collector-config.yaml:/etc/otelcol-contrib/config.yaml
-
-  redis:
-    image: redis
-
-  dramatiq-worker:
-    build:
-      dockerfile: Dockerfile
-      context: .
-      target: dramatiq_app
-    env_file: local.env
-    environment:
-      OTEL_SERVICE_NAME: "bootstrap-fastapi-dramatiq-worker"
-    working_dir: "/app/src"
-    volumes:
-      - '.:/app'
-    depends_on:
-      - redis
-      - otel-collector
-    command:
-      - opentelemetry-instrument
-      - dramatiq
-      - --watch
-      - .
-      - -p
-      - "1"
-      - -t
-      - "1"
-      - dramatiq_worker
-
   dev:
     build:
       dockerfile: Dockerfile
@@ -46,7 +13,7 @@ services:
     volumes:
       - '.:/app'
     depends_on:
-      - redis
+      - dramatiq-worker
       - otel-collector
     command:
       - opentelemetry-instrument
@@ -60,13 +27,14 @@ services:
       # Remember to disable the reloader in order to allow otel instrumentation
       - --reload
 
+  # Production image
   http:
     build:
       dockerfile: Dockerfile
       context: .
       target: http_app
     depends_on:
-      - redis
+      - dramatiq-worker
       - otel-collector
     env_file: local.env
     environment:
@@ -76,7 +44,46 @@ services:
     volumes:
       - './src/sqlite.db:/app/sqlite.db'
 
-  # Starting from here there are only single-run commands, we can use `make` here
+  #########################
+  #### Helper services ####
+  #########################
+
+  otel-collector:
+    image: otel/opentelemetry-collector-contrib
+    volumes:
+      - ./otel-collector-config.yaml:/etc/otelcol-contrib/config.yaml
+
+  redis:
+    image: redis
+
+  dramatiq-worker:
+    build:
+      dockerfile: Dockerfile
+      context: .
+      target: dramatiq_app
+    env_file: local.env
+    environment:
+      OTEL_SERVICE_NAME: "bootstrap-fastapi-dramatiq-worker"
+    working_dir: "/app/src"
+    volumes:
+      - '.:/app'
+    depends_on:
+      - redis
+      - otel-collector
+    command:
+      - opentelemetry-instrument
+      - dramatiq
+      - --watch
+      - .
+      - -p
+      - "1"
+      - -t
+      - "1"
+      - dramatiq_worker
+
+  ##########################
+  #### One-off commands ####
+  ##########################
   test:
     build:
       dockerfile: Dockerfile