Skip to content

Commit aa99e59

Browse files
cyrossignolcyrossignol
committed
Update submodule references
1 parent 862df03 commit aa99e59

File tree

11 files changed

+71
-47
lines changed

11 files changed

+71
-47
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1+
.env
22
docker-compose.override.yml

‎.gitmodules‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
[submodule "tasking-manager"]
22
path = tasking-manager
3-
url = https://github.com/TaskarCenterAtUW/workspaces-tasking-manager.git
3+
url = git@github.com:TaskarCenterAtUW/workspaces-tasking-manager.git
44
branch = workspaces
55
[submodule "osm-cgimap"]
66
path = osm-cgimap
7-
url = https://github.com/TaskarCenterAtUW/workspaces-cgimap.git
7+
url = git@github.com:TaskarCenterAtUW/workspaces-cgimap.git
88
branch = workspaces
99
[submodule "osm-rails"]
1010
path = osm-rails
11-
url = https://github.com/TaskarCenterAtUW/workspaces-openstreetmap-website.git
11+
url = git@github.com:TaskarCenterAtUW/workspaces-openstreetmap-website.git
1212
branch = workspaces
1313
[submodule "frontend"]
1414
path = frontend
15-
url = https://github.com/TaskarCenterAtUW/workspaces-frontend.git
15+
url = git@github.com:TaskarCenterAtUW/workspaces-frontend.git
1616
branch = temp-backup
17+
[submodule "rapid"]
18+
path = rapid
19+
url = [email protected]:TaskarCenterAtUW/workspaces-rapid.git
20+
branch = workspaces
1721
[submodule "pathways-editor"]
1822
path = pathways-editor
19-
url = https://github.com/TaskarCenterAtUW/GTFS-Pathways-Editor
23+
url = [email protected]:TaskarCenterAtUW/workspaces-pathways-editor.git
24+
branch = workspaces

‎docker-compose.build.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,22 @@ services:
55
context: frontend
66
args:
77
VITE_TDEI_API_URL: ${WS_TDEI_API_URL}
8+
VITE_TDEI_USER_API_URL: ${WS_TDEI_BACKEND_URL}
89
VITE_API_URL: ${WS_API_URL}
910
VITE_OSM_URL: ${WS_OSM_URL}
1011
VITE_RAPID_URL: ${WS_RAPID_URL}
12+
VITE_PATHWAYS_EDITOR_URL: ${WS_PATHWAYS_EDITOR_URL}
1113

1214
rapid:
1315
image: ${WS_DOCKER_REGISTRY}/workspaces-rapid:${WS_DOCKER_TAG}
1416
build:
1517
context: rapid
1618

19+
pathways-editor:
20+
image: ${WS_DOCKER_REGISTRY}/workspaces-pathways-editor:${WS_DOCKER_TAG}
21+
build:
22+
context: pathways-editor
23+
1724
osm-log-proxy:
1825
image: ${WS_DOCKER_REGISTRY}/workspaces-osm-log-proxy:${WS_DOCKER_TAG}
1926
build:

‎docker-compose.deploy.yml‎

Lines changed: 25 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,31 @@ services:
9494
- traefik.http.routers.rapid.entrypoints=websecure
9595
- traefik.http.routers.rapid.tls.certresolver=myresolver
9696

97-
osm-log-proxy:
98-
image: ${WS_DOCKER_REGISTRY}/workspaces-osm-log-proxy:${WS_DOCKER_TAG}
99-
depends_on:
100-
- osm-web
101-
#labels:
102-
# - traefik.enable=true
103-
# - traefik.http.routers.osm-log-proxy.rule=Host(`${WS_OSM_HOST}`)
104-
# - traefik.http.services.osm-log-proxy.loadbalancer.server.port=80
105-
# - traefik.http.routers.osm-log-proxy.entrypoints=websecure
106-
# - traefik.http.routers.osm-log-proxy.tls.certresolver=myresolver
97+
pathways-editor:
98+
image: ${WS_DOCKER_REGISTRY}/workspaces-pathways-editor:${WS_DOCKER_TAG}
99+
restart: always
100+
labels:
101+
- traefik.enable=true
102+
- traefik.http.middlewares.cors.headers.accesscontrolallowmethods=*
103+
- traefik.http.middlewares.cors.headers.accesscontrolalloworiginlist=*
104+
- traefik.http.middlewares.cors.headers.accesscontrolmaxage=100
105+
- traefik.http.middlewares.cors.headers.addvaryheader=true
106+
- traefik.http.routers.pathways-editor.rule=Host(`${WS_PATHWAYS_EDITOR_HOST}`)
107+
- traefik.http.routers.pathways-editor.middlewares=cors
108+
- traefik.http.services.pathways-editor.loadbalancer.server.port=80
109+
- traefik.http.routers.pathways-editor.entrypoints=websecure
110+
- traefik.http.routers.pathways-editor.tls.certresolver=myresolver
111+
112+
#osm-log-proxy:
113+
# image: ${WS_DOCKER_REGISTRY}/workspaces-osm-log-proxy:${WS_DOCKER_TAG}
114+
# depends_on:
115+
# - osm-web
116+
# #labels:
117+
# # - traefik.enable=true
118+
# # - traefik.http.routers.osm-log-proxy.rule=Host(`${WS_OSM_HOST}`)
119+
# # - traefik.http.services.osm-log-proxy.loadbalancer.server.port=80
120+
# # - traefik.http.routers.osm-log-proxy.entrypoints=websecure
121+
# # - traefik.http.routers.osm-log-proxy.tls.certresolver=myresolver
107122

108123
osm-web:
109124
image: ${WS_DOCKER_REGISTRY}/workspaces-osm-web:${WS_DOCKER_TAG}
@@ -118,19 +133,6 @@ services:
118133
- traefik.http.routers.osm-web.entrypoints=websecure
119134
- traefik.http.routers.osm-web.tls.certresolver=myresolver
120135

121-
osm-web-old:
122-
image: ${WS_DOCKER_REGISTRY}/workspaces-osm-web:${WS_DOCKER_TAG}
123-
restart: always
124-
depends_on:
125-
- osm-rails
126-
- osm-cgimap
127-
labels:
128-
- traefik.enable=true
129-
- traefik.http.routers.osm-web-old.rule=Host(`${WS_OLD_OSM_HOST}`)
130-
- traefik.http.services.osm-web-old.loadbalancer.server.port=80
131-
- traefik.http.routers.osm-web-old.entrypoints=websecure
132-
- traefik.http.routers.osm-web-old.tls.certresolver=myresolver
133-
134136
osm-rails:
135137
<<: *osm-rails-base
136138
command: bundle exec rails s -p 3000 -b '0.0.0.0'
@@ -175,19 +177,6 @@ services:
175177
- traefik.http.routers.tasks-backend.entrypoints=websecure
176178
- traefik.http.routers.tasks-backend.tls.certresolver=myresolver
177179

178-
tasks-backend-old:
179-
image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:${WS_DOCKER_TAG}
180-
restart: always
181-
env_file: tasking-manager/tasking-manager.env
182-
environment:
183-
GUNICORN_CMD_ARGS: "--workers 5 --threads 5 --timeout 179"
184-
labels:
185-
- traefik.enable=true
186-
- traefik.http.routers.tasks-backend-old.rule=Host(`${WS_OLD_TASKS_HOST}`) && PathPrefix(`/api/`)
187-
- traefik.http.services.tasks-backend-old.loadbalancer.server.port=5000
188-
- traefik.http.routers.tasks-backend-old.entrypoints=websecure
189-
- traefik.http.routers.tasks-backend-old.tls.certresolver=myresolver
190-
191180
volumes:
192181
osm-rails-tmp:
193182
osm-rails-storage:

‎docker-compose.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ services:
3939
tty: true
4040
environment:
4141
VITE_TDEI_API_URL: ${WS_TDEI_API_URL}
42+
VITE_TDEI_USER_API_URL: ${WS_TDEI_BACKEND_URL}
4243
VITE_API_URL: ${WS_API_URL}
4344
VITE_OSM_URL: ${WS_OSM_URL}
4445
VITE_RAPID_URL: ${WS_RAPID_URL}
46+
VITE_PATHWAYS_EDITOR_URL: ${WS_PATHWAYS_EDITOR_URL}
4547
volumes:
4648
- ./frontend:/app
4749
labels:
@@ -56,6 +58,7 @@ services:
5658
rapid:
5759
image: node:latest
5860
entrypoint: npm
61+
command: run start
5962
user: node
6063
working_dir: /app
6164
tty: true
@@ -71,6 +74,25 @@ services:
7174
- traefik.http.routers.rapid.middlewares=cors
7275
- traefik.http.services.rapid.loadbalancer.server.port=8080
7376

77+
pathways-editor:
78+
image: node:latest
79+
entrypoint: npm
80+
command: run start
81+
user: node
82+
working_dir: /app
83+
tty: true
84+
volumes:
85+
- ./pathways-editor:/app
86+
labels:
87+
- traefik.enable=true
88+
- traefik.http.middlewares.cors.headers.accesscontrolallowmethods=*
89+
- traefik.http.middlewares.cors.headers.accesscontrolalloworiginlist=*
90+
- traefik.http.middlewares.cors.headers.accesscontrolmaxage=100
91+
- traefik.http.middlewares.cors.headers.addvaryheader=true
92+
- traefik.http.routers.pathways-editor.rule=Host(`${WS_PATHWAYS_EDITOR_HOST}`)
93+
- traefik.http.routers.pathways-editor.middlewares=cors
94+
- traefik.http.services.pathways-editor.loadbalancer.server.port=8080
95+
7496
osm-log-proxy:
7597
image: nginx:latest
7698
volumes:

‎example.env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ WS_DOCKER_TAG=local
1616
###############################################################################
1717

1818
WS_TDEI_FRONTEND_URL=https://tdei-usermanagement-web-dev.azurewebsites.net/
19+
WS_TDEI_BACKEND_URL=https://tdei-usermanagement-be-dev.azurewebsites.net/api/v1/
1920
WS_TDEI_API_URL=https://tdei-api-dev.azurewebsites.net/api/v1/
2021
WS_TDEI_OIDC_URL=https://tdei-keycloak.azurewebsites.net/
2122
WS_TDEI_OIDC_REALM=tdei

‎frontend‎

Submodule frontend updated 41 files

‎osm-rails‎

Submodule osm-rails updated 757 files

‎pathways-editor‎

Submodule pathways-editor updated 252 files

‎rapid‎

Submodule rapid updated 1 file

0 commit comments

Comments
 (0)