docker overhaul

Author: amelitoalcuitas

.github/workflows/deploy-staging.yml

@@ -34,13 +34,13 @@ jobs:
             cd /home/deploy/aktiv
 
             # Ensure env files exist
-            if [ ! -f backend/.env.staging ]; then
-              echo "ERROR: backend/.env.staging not found"
+            if [ ! -f .env.staging ]; then
+              echo "ERROR: .env.staging not found"
               exit 1
             fi
 
-            if [ ! -f frontend/.env.staging ]; then
-              echo "ERROR: frontend/.env.staging not found"
+            if [ ! -f backend/.env.staging ]; then
+              echo "ERROR: backend/.env.staging not found"
               exit 1
             fi
 
@@ -49,6 +49,9 @@ jobs:
             git checkout staging || git checkout -b staging
             git reset --hard origin/staging
 
+            # Load staging secrets for compose build args
+            export $(cat /home/deploy/aktiv/.env.staging | xargs)
+
             # Rebuild containers cleanly
             # Note: composer install & dump-autoload are already handled in the Dockerfile
             docker compose -f docker-compose.yml -f docker-compose.staging.yml down

docker-compose.staging.yml

@@ -7,13 +7,18 @@ services:
 
   # ─── Frontend ─────────────────────────────────────────────────────────────
   frontend:
-    env_file: !reset
-      - ./frontend/.env.staging
-    user: "root"
-    command: >
-      sh -c "npm install &&
-             npm run build &&
-             node .output/server/index.mjs"
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile
+      args:
+        NUXT_PUBLIC_API_BASE: https://staging.aktivhub.app/api
+        NUXT_API_BASE_INTERNAL: http://nginx/api
+        NUXT_PUBLIC_REVERB_HOST: staging.aktivhub.app
+        NUXT_PUBLIC_REVERB_PORT: "443"
+        NUXT_PUBLIC_REVERB_SCHEME: https
+        NUXT_PUBLIC_REVERB_KEY: ${NUXT_PUBLIC_REVERB_KEY}
+        NUXT_PUBLIC_GOOGLE_MAPS_KEY: ${NUXT_PUBLIC_GOOGLE_MAPS_KEY}
+        NUXT_CLARITY_ID: ${NUXT_CLARITY_ID}
     restart: unless-stopped
 
   # ─── Backend ──────────────────────────────────────────────────────────────

docker-compose.yml

@@ -16,15 +16,10 @@ services:
 
   # ─── Nuxt 3 frontend ───────────────────────────────────────────────────────
   frontend:
-    image: node:20-alpine
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile
     container_name: aktiv_frontend
-    working_dir: /app
-    user: "${UID:-1000}:${GID:-1000}"
-    volumes:
-      - ./frontend:/app
-    env_file:
-      - ./frontend/.env
-    command: sh -c "npm install && npm run dev"
     expose:
       - "3000"
     restart: unless-stopped

frontend/Dockerfile

@@ -0,0 +1,39 @@
+FROM node:20-alpine
+
+WORKDIR /app
+
+# Copy package files first for better layer caching
+COPY package*.json ./
+
+RUN npm ci --production=false
+
+# Copy the rest of the app
+COPY . .
+
+# Build arg declarations — these get baked in at build time
+ARG NUXT_PUBLIC_API_BASE \
+    NUXT_PUBLIC_REVERB_KEY \
+    NUXT_PUBLIC_REVERB_HOST \
+    NUXT_PUBLIC_REVERB_PORT \
+    NUXT_PUBLIC_REVERB_SCHEME \
+    NUXT_PUBLIC_GOOGLE_MAPS_KEY \
+    NUXT_CLARITY_ID \
+    NUXT_API_BASE_INTERNAL
+
+ENV NUXT_PUBLIC_API_BASE=$NUXT_PUBLIC_API_BASE \
+    NUXT_PUBLIC_REVERB_KEY=$NUXT_PUBLIC_REVERB_KEY \
+    NUXT_PUBLIC_REVERB_HOST=$NUXT_PUBLIC_REVERB_HOST \
+    NUXT_PUBLIC_REVERB_PORT=$NUXT_PUBLIC_REVERB_PORT \
+    NUXT_PUBLIC_REVERB_SCHEME=$NUXT_PUBLIC_REVERB_SCHEME \
+    NUXT_PUBLIC_GOOGLE_MAPS_KEY=$NUXT_PUBLIC_GOOGLE_MAPS_KEY \
+    NUXT_CLARITY_ID=$NUXT_CLARITY_ID \
+    NUXT_API_BASE_INTERNAL=$NUXT_API_BASE_INTERNAL
+
+RUN npm run build
+
+EXPOSE 3000
+
+ENV HOST=0.0.0.0 \
+    PORT=3000
+
+CMD ["node", ".output/server/index.mjs"]