Skip to content

Commit 3f50e15

Browse files
committed
GH Actions error fixes
1 parent 63b4c4a commit 3f50e15

File tree

2 files changed

+39
-37
lines changed

2 files changed

+39
-37
lines changed

docker-compose.yml

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -142,43 +142,43 @@ services:
142142
CGIMAP_MAP_NODES: ${WS_OSM_MAX_EXPORT_NODES}
143143
CGIMAP_MAP_AREA: ${WS_OSM_MAX_EXPORT_AREA}
144144

145-
tasks-frontend:
146-
build:
147-
context: tasking-manager
148-
dockerfile: ./scripts/docker/Dockerfile.frontend
149-
volumes:
150-
- ./tasking-manager:/usr/src/app
151-
labels:
152-
- traefik.enable=true
153-
- traefik.http.routers.tasks-frontend.rule=Host(`${WS_TASKS_HOST}`)
154-
- traefik.http.services.tasks-frontend.loadbalancer.server.port=80
155-
156-
tasks-backend:
157-
build:
158-
context: tasking-manager
159-
dockerfile: ./scripts/docker/Dockerfile.backend
160-
target: debug
161-
args:
162-
APP_UID: 1000
163-
env_file: tasking-manager/tasking-manager.env
164-
environment:
165-
GEVENT_SUPPORT: true
166-
ports:
167-
- "5678:5678" # debugpy debugger port
168-
volumes:
169-
- ./tasking-manager:/usr/src/app
170-
labels:
171-
- traefik.enable=true
172-
- traefik.http.routers.tasks-backend.rule=Host(`${WS_TASKS_HOST}`) && PathPrefix(`/api/`)
173-
- traefik.http.routers.tasks-backend.service=tasks-backend
174-
- traefik.http.services.tasks-backend.loadbalancer.server.port=5000
175-
# Workspaces backend currently lives in the TM. Emulate a separate server for now:
176-
- traefik.http.middlewares.workspaces-backend-emulation.replacepathregex.regex=^/api/v1/(.*)
177-
- traefik.http.middlewares.workspaces-backend-emulation.replacepathregex.replacement=/api/v2/$$1/
178-
- traefik.http.routers.workspaces-backend.rule=Host(`${WS_API_HOST}`)
179-
- traefik.http.routers.workspaces-backend.service=workspaces-backend
180-
- traefik.http.services.workspaces-backend.loadbalancer.server.port=5000
181-
- traefik.http.routers.workspaces-backend.middlewares=workspaces-backend-emulation
145+
# tasks-frontend:
146+
# build:
147+
# context: tasking-manager
148+
# dockerfile: ./scripts/docker/Dockerfile.frontend
149+
# volumes:
150+
# - ./tasking-manager:/usr/src/app
151+
# labels:
152+
# - traefik.enable=true
153+
# - traefik.http.routers.tasks-frontend.rule=Host(`${WS_TASKS_HOST}`)
154+
# - traefik.http.services.tasks-frontend.loadbalancer.server.port=80
155+
156+
# tasks-backend:
157+
# build:
158+
# context: tasking-manager
159+
# dockerfile: ./scripts/docker/Dockerfile.backend
160+
# target: debug
161+
# args:
162+
# APP_UID: 1000
163+
# env_file: tasking-manager/tasking-manager.env
164+
# environment:
165+
# GEVENT_SUPPORT: true
166+
# ports:
167+
# - "5678:5678" # debugpy debugger port
168+
# volumes:
169+
# - ./tasking-manager:/usr/src/app
170+
# labels:
171+
# - traefik.enable=true
172+
# - traefik.http.routers.tasks-backend.rule=Host(`${WS_TASKS_HOST}`) && PathPrefix(`/api/`)
173+
# - traefik.http.routers.tasks-backend.service=tasks-backend
174+
# - traefik.http.services.tasks-backend.loadbalancer.server.port=5000
175+
# # Workspaces backend currently lives in the TM. Emulate a separate server for now:
176+
# - traefik.http.middlewares.workspaces-backend-emulation.replacepathregex.regex=^/api/v1/(.*)
177+
# - traefik.http.middlewares.workspaces-backend-emulation.replacepathregex.replacement=/api/v2/$$1/
178+
# - traefik.http.routers.workspaces-backend.rule=Host(`${WS_API_HOST}`)
179+
# - traefik.http.routers.workspaces-backend.service=workspaces-backend
180+
# - traefik.http.services.workspaces-backend.loadbalancer.server.port=5000
181+
# - traefik.http.routers.workspaces-backend.middlewares=workspaces-backend-emulation
182182

183183
volumes:
184184
osm-rails-tmp:

tdei_uw.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ WS_PATHWAYS_EDITOR_HOST=pathways.workspaces-${ENV}.sidewalks.washington.edu
3232
WS_OSM_HOST=osm.workspaces-${ENV}.sidewalks.washington.edu
3333
WS_TASKS_HOST=tasks.workspaces-${ENV}.sidewalks.washington.edu
3434

35+
WS_DEV_PORT=3000
36+
3537
WS_FRONTEND_URL=https://${WS_FRONTEND_HOST}/
3638
WS_API_URL=https://${WS_API_HOST}/api/v1/
3739
WS_RAPID_URL=https://${WS_RAPID_HOST}/

0 commit comments

Comments
 (0)