feat/refactor: revert changes to docker entry point, supply MONITORING arg to Dockerfile and github action

Author: stanleypliu

.github/workflows/build_and_deploy.yml

@@ -20,8 +20,9 @@ jobs:
       context: ./src/backend
       build_target: service
       image_name: ghcr.io/${{ github.repository }}/backend
-      dockerfile: Dockerfile
       scan_image: false
+      extra_build_args: |
+        MONITORING=${{ secrets.MONITORING }}
     secrets: inherit
 
   extra-vars:

compose.yaml

@@ -16,6 +16,8 @@ services:
     build:
       context: src/backend
       dockerfile: Dockerfile
+      args:
+        - MONITORING=${MONITORING}
     depends_on:
       - db
       - minio

src/backend/Dockerfile

@@ -9,16 +9,16 @@ RUN set -ex \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install \
     -y --no-install-recommends \
-        "build-essential" \
-        "gcc" \
-        "g++" \
-        "libpcre2-dev" \
-        "libpq-dev" \
-        "libspatialindex-dev" \
-        "libproj-dev" \
-        "libgeos-dev" \
-        "libgdal-dev" \
-        "git" \
+    "build-essential" \
+    "gcc" \
+    "g++" \
+    "libpcre2-dev" \
+    "libpq-dev" \
+    "libspatialindex-dev" \
+    "libproj-dev" \
+    "libgeos-dev" \
+    "libgdal-dev" \
+    "git" \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /project
@@ -50,11 +50,19 @@ STOPSIGNAL SIGINT
 COPY ./pyproject.toml ./alembic.ini ./uv.lock /project/
 COPY packages /project/packages
 
+ARG MONITORING
+
 # Install dependencies using uv (caching to improve speed for repeated builds)
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
-    --mount=type=bind,source=uv.lock,target=uv.lock \
-    uv sync --locked --no-editable --no-dev
+    --mount=type=bind,source=uv.lock,target=uv.lock <<EOT
+    set -e
+    EXTRA_GROUPS=""
+    if [ "$MONITORING" = "sentry" ]; then
+        EXTRA_GROUPS="--group monitoring"
+    fi
+    uv sync --locked --no-editable --no-dev $EXTRA_GROUPS
+EOT
 
 # Run stage (final stage)
 FROM python:$PYTHON_IMG_TAG-slim-trixie AS service
@@ -70,9 +78,9 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
     CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
 
 RUN set -ex \
-&& apt-get update \
-&& DEBIAN_FRONTEND=noninteractive apt-get install \
--y --no-install-recommends \
+    && apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install \
+    -y --no-install-recommends \
     "nano" \
     "curl" \
     "gettext-base" \
@@ -85,7 +93,7 @@ RUN set -ex \
     "libproj25" \
     "libgeos-c1t64" \
     "libgdal36" \
-&& rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/*
 
 # Retrieve global Python packages and dependencies from the build stage
 COPY --from=build /opt/python /opt/python

src/backend/docker-entrypoint.sh

@@ -2,16 +2,6 @@
 
 set -eo pipefail
 
-# Function to install monitoring dependencies if MONITORING is set
-install_monitoring_deps() {
-    if [ "$MONITORING" = "sentry" ]; then
-        echo "Installing monitoring dependencies..."
-        uv sync --locked --no-editable --no-dev --group monitoring
-    else
-        echo "MONITORING is blank/invalid, skipping installation of monitoring dependencies."
-    fi
-}
-
 wait_for_db() {
     max_retries=30
     retry_interval=5
@@ -29,13 +19,10 @@ wait_for_db() {
     exit 1  # Exit with an error code
 }
 
-# Install monitoring dependencies
-install_monitoring_deps
-
 # Start wait in background with tmp log files
 wait_for_db &
 wait
 
 exec "$@"
 
-exit 0
+exit 0