Update Dockerfile and docker-compose.yaml

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

Author: febus982

Dockerfile

@@ -10,78 +10,76 @@ RUN chown nonroot:nonroot /app
 # Creating a separate directory for venvs allows to easily
 # copy them from the builder and to mount the application
 # for local development
-RUN mkdir /poetryvenvs && chown nonroot:nonroot /poetryvenvs
+RUN mkdir /venv && chown nonroot:nonroot /venv
+ENV PATH="/venv/bin:$PATH"
 
 # Install necessary runtime libraries (e.g. libmysql)
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
     make \
     && rm -rf /var/lib/apt/lists/*
 
-# Update pip and install poetry
-RUN pip install --no-cache-dir -U pip
-RUN pip install --no-cache-dir -U poetry
-
-# We run everything by poetry run from now on, so that PATH will be handled
-# for binaries installed in virtual environments
-ENTRYPOINT ["poetry", "run"]
-
 FROM base AS base_builder
+ENV UV_PROJECT_ENVIRONMENT=/venv
+# Enable bytecode compilation
+ENV UV_COMPILE_BYTECODE=1
+
 # Install build system requirements (gcc, library headers, etc.)
 # for compiled Python requirements like psycopg2
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
     build-essential gcc git \
     && rm -rf /var/lib/apt/lists/*
 
+COPY --from=ghcr.io/astral-sh/uv:0.5.13 /uv /uvx /bin/
+
 # From here we shouldn't need anymore a root user
 # Switch to nonroot and config poetry
 USER nonroot
-RUN poetry config virtualenvs.path /poetryvenvs
 
 COPY --chown=nonroot:nonroot pyproject.toml .
-COPY --chown=nonroot:nonroot poetry.lock .
+COPY --chown=nonroot:nonroot uv.lock .
 COPY --chown=nonroot:nonroot Makefile .
 
-# Test image, contains all files and dependencies
+# Dev image, contains all files and dependencies
 FROM base_builder AS dev
 COPY --chown=nonroot:nonroot . .
-RUN make dev-dependencies
+RUN --mount=type=cache,target=~/.cache/uv \
+    make dev-dependencies
+
 # Note that opentelemetry doesn't play well together with uvicorn reloader
 # when signals are propagated, we disable it in dev image default CMD
 CMD ["uvicorn", "http_app:create_app", "--host", "0.0.0.0", "--port", "8000", "--factory", "--reload"]
 
 # Installs requirements to run production dramatiq application
 FROM base_builder AS dramatiq_builder
-RUN poetry install --no-root
+RUN --mount=type=cache,target=~/.cache/uv \
+    uv sync --no-dev --no-install-project --frozen --no-editable
 
 # Installs requirements to run production http application
 FROM base_builder AS http_builder
-RUN poetry install --no-root --with http
+RUN --mount=type=cache,target=~/.cache/uv \
+    uv sync --no-dev --group http --no-install-project --frozen --no-editable
 
-# Copy the shared python packages
+# Create the base app with the common python packages
 FROM base AS base_app
 USER nonroot
-RUN poetry config virtualenvs.path /poetryvenvs
-COPY --chown=nonroot:nonroot pyproject.toml .
-COPY --chown=nonroot:nonroot poetry.lock .
 COPY --chown=nonroot:nonroot src/alembic ./alembic
 COPY --chown=nonroot:nonroot src/domains ./domains
 COPY --chown=nonroot:nonroot src/gateways ./gateways
 COPY --chown=nonroot:nonroot src/common ./common
 COPY --chown=nonroot:nonroot src/alembic.ini .
-COPY --chown=nonroot:nonroot Makefile .
 
 # Copy the http python package and requirements from relevant builder
 FROM base_app AS http_app
-COPY --from=http_builder /poetryvenvs /poetryvenvs
+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"]
 
 # Copy the dramatiq python package and requirements from relevant builder
 FROM base_app AS dramatiq_app
-COPY --from=dramatiq_builder /poetryvenvs /poetryvenvs
+COPY --from=dramatiq_builder /venv /venv
 COPY --chown=nonroot:nonroot src/dramatiq_worker ./dramatiq_worker
 # Run CMD using array syntax, so it's uses `exec` and runs as PID1
 # TODO: Review processes/threads

docker-compose.yaml

@@ -1,5 +1,4 @@
 services:
-
   otel-collector:
     image: otel/opentelemetry-collector-contrib
     volumes:
@@ -13,11 +12,9 @@ services:
       dockerfile: Dockerfile
       context: .
       target: dramatiq_app
+    env_file: local.env
     environment:
-      WATCHFILES_FORCE_POLLING: true
       OTEL_SERVICE_NAME: "bootstrap-fastapi-dramatiq-worker"
-      OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector:4317"
-      DRAMATIQ__REDIS_URL: "redis://redis:6379/0"
     working_dir: "/app/src"
     volumes:
       - '.:/app'
@@ -40,10 +37,9 @@ services:
       dockerfile: Dockerfile
       context: .
       target: dev
+    env_file: local.env
     environment:
-      WATCHFILES_FORCE_POLLING: true
       OTEL_SERVICE_NAME: "bootstrap-fastapi-dev"
-      OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector:4317"
     ports:
       - '8000:8000'
     working_dir: "/app/src"
@@ -72,9 +68,9 @@ services:
     depends_on:
       - redis
       - otel-collector
+    env_file: local.env
     environment:
       OTEL_SERVICE_NAME: "bootstrap-fastapi-http"
-      OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector:4317"
     ports:
       - '8001:8000'
     volumes:

local.env

@@ -0,0 +1,2 @@
+DRAMATIQ__REDIS_URL: "redis://redis:6379/0"
+OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector:4317"