Update Dockerfile and docker-compose.yaml

Author: febus982

Dockerfile

@@ -61,6 +61,11 @@ FROM base_builder AS http_builder
 RUN --mount=type=cache,target=~/.cache/uv \
     uv sync --no-dev --group http --no-install-project --frozen --no-editable
 
+# Installs requirements to run production http application
+FROM base_builder AS socketio_builder
+RUN --mount=type=cache,target=~/.cache/uv \
+    uv sync --no-dev --group socketio --no-install-project --frozen --no-editable
+
 # Create the base app with the common python packages
 FROM base AS base_app
 USER nonroot
@@ -75,7 +80,14 @@ FROM base_app AS http_app
 COPY --from=http_builder /venv /venv
 COPY --chown=nonroot:nonroot src/http_app ./http_app
 # Run CMD using array syntax, so it's uses `exec` and runs as PID1
-CMD ["opentelemetry-instrument", "uvicorn", "http_app:create_app", "--host", "0.0.0.0", "--port", "8000", "--factory"]
+CMD ["opentelemetry-instrument", "python", "-m", "http_app"]
+
+# Copy the socketio python package and requirements from relevant builder
+FROM base_app AS socketio_app
+COPY --from=socketio_builder_builder /venv /venv
+COPY --chown=nonroot:nonroot src/socketio_app ./socketio_app
+# Run CMD using array syntax, so it's uses `exec` and runs as PID1
+CMD ["opentelemetry-instrument", "python", "-m", "socketio_app"]
 
 # Copy the dramatiq python package and requirements from relevant builder
 FROM base_app AS dramatiq_app

Makefile

@@ -8,8 +8,11 @@ containers:
 	# To build shared container layers only once we build a single container before the other ones
 	docker compose build --build-arg UID=`id -u`
 
-dev:
-	uv run uvicorn http_app:create_app --host 0.0.0.0 --port 8000 --factory --reload
+dev-http:
+	uv run ./src/http_app/dev_server.py
+
+dev-socketio:
+	uv run ./src/socketio_app/dev_server.py
 
 otel:
 	OTEL_SERVICE_NAME=bootstrap-fastapi OTEL_TRACES_EXPORTER=none OTEL_METRICS_EXPORTER=none OTEL_LOGS_EXPORTER=none uv run opentelemetry-instrument uvicorn http_app:create_app --host 0.0.0.0 --port 8000 --factory

docker-compose.yaml

@@ -1,5 +1,5 @@
 services:
-  dev:
+  dev-http: &dev
     build:
       dockerfile: Dockerfile
       context: .
@@ -13,28 +13,23 @@ services:
     volumes:
       - '.:/app'
     depends_on:
+      - redis
       - otel-collector
     command:
       - opentelemetry-instrument
       - python
       - ./http_app/dev_server.py
 
-
-  # Production image
-  http:
-    build:
-      dockerfile: Dockerfile
-      context: .
-      target: http_app
-    depends_on:
-      - otel-collector
-    env_file: local.env
+  dev-socketio:
+    <<: *dev
     environment:
-      OTEL_SERVICE_NAME: "bootstrap-fastapi-http"
+      OTEL_SERVICE_NAME: "bootstrap-socketio-dev"
     ports:
-      - '8001:8000'
-    volumes:
-      - './src/sqlite.db:/app/sqlite.db'
+      - '8001:8001'
+    command:
+      - opentelemetry-instrument
+      - python
+      - ./socketio_app/dev_server.py
 
   #########################
   #### Helper services ####
@@ -49,19 +44,10 @@ services:
     image: redis
 
   dramatiq-worker:
-    build:
-      dockerfile: Dockerfile
-      context: .
-      target: dramatiq_app
-    env_file: local.env
+    <<: *dev
     environment:
       OTEL_SERVICE_NAME: "bootstrap-fastapi-dramatiq-worker"
-    working_dir: "/app/src"
-    volumes:
-      - '.:/app'
-    depends_on:
-      - redis
-      - otel-collector
+    ports: []
     command:
       - opentelemetry-instrument
       - dramatiq
@@ -128,7 +114,7 @@ services:
     depends_on:
       - kratos
       - auth-ui
-      - dev
+      - dev-http
     ports:
       # Public traffic port
       - "8080:4455"
@@ -155,11 +141,3 @@ services:
       - "make"
       - "test"
 
-  ci-test:
-    build:
-      dockerfile: Dockerfile
-      context: .
-      target: dev
-    command:
-      - "make"
-      - "ci-test"