Fix schema environment variables

Author: cyrossignol

docker-compose.build.yml

@@ -15,9 +15,9 @@ services:
         VITE_OSM_URL: ${WS_OSM_URL}
         VITE_RAPID_URL: ${WS_RAPID_URL}
         VITE_PATHWAYS_EDITOR_URL: ${WS_PATHWAYS_EDITOR_URL}
-        VITE_IMAGERY_SCHEMA: ${WS_IMAGERY_SCHEMA}
+        VITE_IMAGERY_SCHEMA: ${WS_IMAGERY_SCHEMA_URL}
         VITE_IMAGERY_EXAMPLE_URL: ${WS_IMAGERY_EXAMPLE_URL}
-        VITE_LONG_FORM_QUEST_SCHEMA: ${WS_LONG_FORM_QUEST_SCHEMA}
+        VITE_LONG_FORM_QUEST_SCHEMA: ${WS_LONG_FORM_QUEST_SCHEMA_URL}
         VITE_LONG_FORM_QUEST_EXAMPLE_URL: ${WS_LONG_FORM_QUEST_EXAMPLE_URL}
         CODE_VERSION: ${CODE_VERSION}
 
@@ -182,7 +182,7 @@ services:
         VITE_TDEI_USER_API_URL: ${WS_TDEI_BACKEND_URL}
         VITE_API_URL: ${WS_API_URL}
         VITE_OSM_URL: ${WS_OSM_URL}
-  
+
   leaderboard-frontend_tag:
     extends: leaderboard-frontend
     image: ${WS_DOCKER_REGISTRY}/workspaces-leaderboard-frontend:${CODE_VERSION}

docker-compose.deploy.yml

@@ -28,7 +28,7 @@ x-osm-rails-base:
   tmpfs: /tmp/pids/
   stdin_open: true
   tty: true
-    
+
 ################################################################################
 
 services:
@@ -74,6 +74,8 @@ services:
     env_file: tasking-manager/tasking-manager.env
     environment:
       GUNICORN_CMD_ARGS: "--workers 5 --threads 5 --timeout 179"
+      WS_LONGFORM_SCHEMA_URL: ${WS_LONG_FORM_QUEST_SCHEMA_URL}
+      WS_IMAGERY_SCHEMA_URL: ${WS_IMAGERY_SCHEMA_URL}
     labels:
       - traefik.enable=true
       - traefik.http.routers.workspaces-backend.rule=Host(`${WS_API_HOST}`)
@@ -88,10 +90,10 @@ services:
       - traefik.http.middlewares.redirect-to-https.replacepathregex.regex=^/api/v1/(.*)
       - traefik.http.middlewares.redirect-to-https.replacepathregex.replacement=/api/v1/$$1/
 
-      - traefik.http.routers.workspaces-backend.middlewares=cors-ws-backend,redirect-to-https 
+      - traefik.http.routers.workspaces-backend.middlewares=cors-ws-backend,redirect-to-https
       - traefik.http.routers.workspaces-backend.entrypoints=websecure
       - traefik.http.routers.workspaces-backend.tls.certresolver=myresolver
-      
+
   # workspaces editors
   rapid:
     image: ${WS_DOCKER_REGISTRY}/workspaces-rapid:${WS_DOCKER_TAG}

docker-compose.yml

@@ -53,6 +53,10 @@ services:
       VITE_OSM_URL: ${WS_OSM_URL}
       VITE_RAPID_URL: ${WS_RAPID_URL}
       VITE_PATHWAYS_EDITOR_URL: ${WS_PATHWAYS_EDITOR_URL}
+      VITE_IMAGERY_SCHEMA: ${WS_IMAGERY_SCHEMA_URL}
+      VITE_IMAGERY_EXAMPLE_URL: ${WS_IMAGERY_EXAMPLE_URL}
+      VITE_LONG_FORM_QUEST_SCHEMA: ${WS_LONG_FORM_QUEST_SCHEMA_URL}
+      VITE_LONG_FORM_QUEST_EXAMPLE_URL: ${WS_LONG_FORM_QUEST_EXAMPLE_URL}
     volumes:
       - ./frontend:/app
     labels:
@@ -172,6 +176,8 @@ services:
     env_file: tasking-manager/tasking-manager.env
     environment:
       GEVENT_SUPPORT: true
+      WS_LONGFORM_SCHEMA_URL: ${WS_LONG_FORM_QUEST_SCHEMA_URL}
+      WS_IMAGERY_SCHEMA_URL: ${WS_IMAGERY_SCHEMA_URL}
     ports:
       - "5678:5678" # debugpy debugger port
     volumes:

example.env

@@ -26,7 +26,6 @@ WS_API_HOST=api.workspaces.local
 WS_RAPID_HOST=rapid.workspaces.local
 WS_OSM_HOST=osm.workspaces.local
 WS_TASKS_HOST=tasks.workspaces.local
-WS_IMAGERY_SCHEMA=https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/refs/heads/main/docs/imagery-layer/schema.json
 
 WS_DEV_PORT=3000
 
@@ -40,6 +39,15 @@ WS_OSM_SECRET_KEY_BASE=secret
 WS_TASKS_SECRET_KEY=secret
 WS_MAPBOX_ACCESS_TOKEN=secret
 
+###############################################################################
+# Schemas
+###############################################################################
+
+WS_IMAGERY_SCHEMA_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/asr-imagery-list/refs/heads/main/schema/schema.json
+WS_IMAGERY_EXAMPLE_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/asr-imagery-list/refs/heads/main/examples/example.json
+WS_LONG_FORM_QUEST_SCHEMA_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/asr-quests/refs/heads/main/schema/schema.json
+WS_LONG_FORM_QUEST_EXAMPLE_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/asr-quests/refs/heads/main/examples/example.json
+
 ###############################################################################
 # Databases
 ###############################################################################

tdei_uw.env

@@ -1,11 +1,11 @@
 #
-# Resources for dev and stage are often db-dev, db-stage, while prod resources 
-# are just "db", not "db-prod". This variable allows us to construct the 
+# Resources for dev and stage are often db-dev, db-stage, while prod resources
+# are just "db", not "db-prod". This variable allows us to construct the
 # environment-prefixed variable values without putting the "-" in ENV which is
 # used elsewhere.
 #
 # **This variable should therefore be set to empty string on prod **
-# 
+#
 ENV_NAME_PARAM=-${ENV}
 
 ###############################################################################
@@ -43,10 +43,6 @@ WS_RAPID_HOST=rapid.workspaces${ENV_NAME_PARAM}.sidewalks.washington.edu
 WS_PATHWAYS_EDITOR_HOST=pathways.workspaces${ENV_NAME_PARAM}.sidewalks.washington.edu
 WS_OSM_HOST=osm.workspaces${ENV_NAME_PARAM}.sidewalks.washington.edu
 WS_TASKS_HOST=tasks.workspaces${ENV_NAME_PARAM}.sidewalks.washington.edu
-WS_IMAGERY_SCHEMA=https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/refs/heads/main/docs/imagery-layer/schema.json
-WS_IMAGERY_EXAMPLE_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/refs/heads/main/docs/imagery-layer/example.json
-WS_LONG_FORM_QUEST_SCHEMA=https://raw.githubusercontent.com/TaskarCenterAtUW/asr-quests/refs/heads/main/schema/schema.json
-WS_LONG_FORM_QUEST_EXAMPLE_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/asr-quests/refs/heads/main/examples/example.json
 
 WS_DEV_PORT=3000
 
@@ -61,10 +57,14 @@ WS_OSM_SECRET_KEY_BASE=${WS_OSM_SECRET_KEY_BASE}
 WS_TASKS_SECRET_KEY=${WS_TASKS_SECRET_KEY}
 WS_MAPBOX_ACCESS_TOKEN=${WS_MAPBOX_ACCESS_TOKEN}
 
-# Backend
+###############################################################################
+# Schemas
+###############################################################################
 
-IMAGERY_SCHEMA_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/refs/heads/main/docs/imagery-layer/schema.json
-LONGFORM_SCHEMA_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/asr-quests/refs/heads/main/schema/schema.json
+WS_IMAGERY_SCHEMA_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/asr-imagery-list/refs/heads/main/schema/schema.json
+WS_IMAGERY_EXAMPLE_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/asr-imagery-list/refs/heads/main/examples/example.json
+WS_LONG_FORM_QUEST_SCHEMA_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/asr-quests/refs/heads/main/schema/schema.json
+WS_LONG_FORM_QUEST_EXAMPLE_URL=https://raw.githubusercontent.com/TaskarCenterAtUW/asr-quests/refs/heads/main/examples/example.json
 
 ###############################################################################
 # Databases