Copy build args to override file because they need to be set in both override and base

Author: jeffmaki

cleanup-repos.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+rm -rf tasking-manager/
+rm -rf rapid/
+rm -rf pathways-editor/
+rm -rf osm-rails/
+rm -rf osm-cgimap/
+rm -rf leaderboard/
+rm -rf frontend/

docker-compose.override.build.yml

@@ -3,6 +3,7 @@ services:
   frontend:
     image: ${WS_DOCKER_REGISTRY}/workspaces-frontend:${ENV}
     build:
+      context: frontend
       cache_from:
         - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-frontend:buildcache
       cache_to:
@@ -16,6 +17,7 @@ services:
   rapid:
     image: ${WS_DOCKER_REGISTRY}/workspaces-rapid:${ENV}
     build:
+      context: rapid
       cache_from:
         - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-rapid:buildcache
       cache_to:
@@ -29,6 +31,7 @@ services:
   pathways-editor:
     image: ${WS_DOCKER_REGISTRY}/workspaces-pathways-editor:${ENV}
     build:
+      context: pathways-editor
       cache_from:
         - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-pathways-editor:buildcache
       cache_to:
@@ -68,6 +71,13 @@ services:
   osm-rails:
     image: ${WS_DOCKER_REGISTRY}/workspaces-osm-rails:${ENV}
     build:
+      dockerfile: Dockerfile.prod
+      context: osm-rails
+      args:
+        WS_OSM_DB_HOST: ${WS_OSM_DB_HOST}
+        WS_OSM_DB_USER: ${WS_OSM_DB_USER}
+        WS_OSM_DB_PASS: ${WS_OSM_DB_PASS}
+        WS_OSM_DB_NAME: ${WS_OSM_DB_NAME}
       cache_from:
         - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-osm-rails:buildcache
       cache_to:
@@ -81,6 +91,8 @@ services:
   osm-cgimap:
     image: ${WS_DOCKER_REGISTRY}/workspaces-osm-cgimap:${ENV}
     build:
+      context: osm-cgimap
+      dockerfile: docker/ubuntu/Dockerfile2404
       cache_from:
         - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-osm-cgimap:buildcache
       cache_to:
@@ -94,6 +106,11 @@ services:
   tasks-backend:
     image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:${ENV}
     build:
+      context: tasking-manager
+      dockerfile: ./scripts/docker/Dockerfile.backend
+      target: debug
+      args:
+        APP_UID: 1000
       cache_from:
         - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:buildcache
       cache_to:
@@ -107,6 +124,8 @@ services:
   leaderboard-frontend:
     image: ${WS_DOCKER_REGISTRY}/workspaces-leaderboard-frontend:${ENV}
     build:
+      context: ./leaderboard/frontend
+      dockerfile: Dockerfile
       cache_from:
         - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-leaderboard-frontend:buildcache
       cache_to:
@@ -119,6 +138,8 @@ services:
   leaderboard-backend:
     image: ${WS_DOCKER_REGISTRY}/workspaces-leaderboard-backend:${ENV}
     build:
+      context: ./leaderboard/backend
+      dockerfile: Dockerfile
       cache_from:
         - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-leaderboard-backend:buildcache
       cache_to:

docker-compose.yml

@@ -46,6 +46,8 @@ services:
     user: node
     working_dir: /app
     tty: true
+    build:
+        context: frontend
     environment:
       VITE_TDEI_API_URL: ${WS_TDEI_API_URL}
       VITE_TDEI_USER_API_URL: ${WS_TDEI_BACKEND_URL}
@@ -75,6 +77,8 @@ services:
     user: node
     working_dir: /app
     tty: true
+    build:
+        context: rapid
     volumes:
       - ./rapid:/app
     labels:
@@ -95,8 +99,7 @@ services:
     working_dir: /app
     tty: true
     build:
-      context: pathways-editor
-      dockerfile: Dockerfile
+        context: pathways-editor
     volumes:
       - ./pathways-editor:/app
     labels: