♻️ Enable the API and Workflows dev deployments to coexist

Taskfile.yml

@@ -15,6 +15,8 @@ vars:
   TESTS_MINIO_REGION: eu-central-1
   TESTS_MINIO_BUCKET_NAME: moderateapi-tests
   TESTS_MINIO_ENDPOINT_URL: http://localhost:{{.TESTS_MINIO_PUBLIC_PORT}}
+  DEV_KEYCLOAK_PORT: '{{default "8989" .DEV_KEYCLOAK_PORT}}'
+  DEV_POSTGRES_PORT: '{{default "5433" .DEV_POSTGRES_PORT}}'
 
 env:
   COMPOSE_PROJECT_NAME: "{{.COMPOSE_PROJECT_NAME}}"
@@ -30,6 +32,13 @@ env:
   TESTS_MINIO_REGION: "{{.TESTS_MINIO_REGION}}"
   TESTS_MINIO_BUCKET_NAME: "{{.TESTS_MINIO_BUCKET_NAME}}"
   TESTS_MINIO_ENDPOINT_URL: "{{.TESTS_MINIO_ENDPOINT_URL}}"
+  DEV_KEYCLOAK_PORT: "{{.DEV_KEYCLOAK_PORT}}"
+  DEV_POSTGRES_PORT: "{{.DEV_POSTGRES_PORT}}"
+  MODERATE_API_S3__ACCESS_KEY: "{{.MINIO_ROOT_USER}}"
+  MODERATE_API_S3__SECRET_KEY: "{{.MINIO_ROOT_PASSWORD}}"
+  MODERATE_API_S3__ENDPOINT_URL: http://minio:9000
+  MODERATE_API_S3__REGION: "{{.MINIO_REGION}}"
+  MODERATE_API_S3__BUCKET: "{{.MINIO_BUCKET_NAME}}"
 
 dotenv: [.env.dev, .env.dev.default]
 
@@ -39,6 +48,19 @@ tasks:
     cmds:
       - docker compose -f {{.ROOT_DIR}}/docker-compose-dev.yml up -d --build
 
+  dev-up-gcs:
+    desc: Start the development stack using GCS instead of the local MinIO
+    requires:
+      vars: [ACCESS_KEY, SECRET_KEY]
+    env:
+      MODERATE_API_S3__ACCESS_KEY: "{{.ACCESS_KEY}}"
+      MODERATE_API_S3__SECRET_KEY: "{{.SECRET_KEY}}"
+      MODERATE_API_S3__ENDPOINT_URL: https://storage.googleapis.com
+      MODERATE_API_S3__REGION: '{{default "europe-west1" .GCS_REGION}}'
+      MODERATE_API_S3__BUCKET: '{{default "moderateapi-tests" .GCS_BUCKET}}'
+    cmds:
+      - docker compose -f {{.ROOT_DIR}}/docker-compose-dev.yml up -d --build
+
   dev-down:
     desc: Stop and remove all traces of the development stack
     cmds:

docker-compose-dev.yml

@@ -9,11 +9,11 @@ services:
       LOG_LEVEL: DEBUG
       MODERATE_API_OPENID_CONFIG_URL: http://keycloak:8080/realms/moderate/.well-known/openid-configuration
       MODERATE_API_POSTGRES_URL: postgresql+asyncpg://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/moderateapi
-      MODERATE_API_S3__ACCESS_KEY: ${MINIO_ROOT_USER}
-      MODERATE_API_S3__SECRET_KEY: ${MINIO_ROOT_PASSWORD}
-      MODERATE_API_S3__ENDPOINT_URL: http://minio:9000
-      MODERATE_API_S3__REGION: ${MINIO_REGION}
-      MODERATE_API_S3__BUCKET: ${MINIO_BUCKET_NAME}
+      MODERATE_API_S3__ACCESS_KEY: ${MODERATE_API_S3__ACCESS_KEY}
+      MODERATE_API_S3__SECRET_KEY: ${MODERATE_API_S3__SECRET_KEY}
+      MODERATE_API_S3__ENDPOINT_URL: ${MODERATE_API_S3__ENDPOINT_URL}
+      MODERATE_API_S3__REGION: ${MODERATE_API_S3__REGION}
+      MODERATE_API_S3__BUCKET: ${MODERATE_API_S3__BUCKET}
   apisix:
     image: apache/apisix:3.5.0-debian
     restart: on-failure
@@ -36,7 +36,7 @@ services:
     image: quay.io/keycloak/keycloak:22.0
     restart: on-failure
     ports:
-      - 8080:8080
+      - ${DEV_KEYCLOAK_PORT:-8080}:8080
     command: [start-dev]
     environment:
       KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN_USER}
@@ -61,7 +61,7 @@ services:
     image: postgres:15
     restart: on-failure
     ports:
-      - 5432:5432
+      - ${DEV_POSTGRES_PORT:-5432}:5432
     environment:
       POSTGRES_DB: ${KEYCLOAK_POSTGRES_DBNAME}
       POSTGRES_USER: ${POSTGRES_USER}