Skip to content

Commit a27f631

Browse files
jeffmakijeffmaki
committed
Change to use override file plus integration on Sentry
1 parent fb3afb0 commit a27f631

File tree

5 files changed

+43
-89
lines changed

5 files changed

+43
-89
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ jobs:
118118

119119
- name: Build and push
120120
run: |
121-
docker compose -f docker-compose.build.yml --env-file tdei_uw.env build --build-arg CODE_VERSION=${CODE_VERSION} ${{github.event.inputs.build_flag}}
122-
docker compose -f docker-compose.build.yml --env-file tdei_uw.env push
121+
docker compose -f docker-compose.override.build.yml -f docker-compose.yml build --build-arg CODE_VERSION=${CODE_VERSION} ${{github.event.inputs.build_flag}}
122+
docker compose -f docker-compose.override.build.yml -f docker-compose.yml push
123123
124124
env:
125125
ENV: ${{ vars.ENV }}
@@ -183,7 +183,7 @@ jobs:
183183
docker image prune -a -f
184184
185185
# pull new images, recreate containers
186-
docker compose -f docker-compose.deploy.yml --env-file tdei_uw.env up -d --force-recreate --remove-orphans
186+
docker compose -f docker-compose.override.d.yml -f docker-compose.yml --env-file tdei_uw.env up -d --force-recreate --remove-orphans
187187
188188
# check what was deployed, just to save in the GH logs
189189
echo Waiting for deployment to complete

docker-compose.build.yml renamed to docker-compose.override.build.yml

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,10 @@ services:
33
frontend:
44
image: ${WS_DOCKER_REGISTRY}/workspaces-frontend:${ENV}
55
build:
6-
context: frontend
76
cache_from:
87
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-frontend:buildcache
98
cache_to:
109
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-frontend:buildcache,mode=max
11-
args:
12-
VITE_TDEI_API_URL: ${WS_TDEI_API_URL}
13-
VITE_TDEI_USER_API_URL: ${WS_TDEI_BACKEND_URL}
14-
VITE_API_URL: ${WS_API_URL}
15-
VITE_OSM_URL: ${WS_OSM_URL}
16-
VITE_RAPID_URL: ${WS_RAPID_URL}
17-
VITE_PATHWAYS_EDITOR_URL: ${WS_PATHWAYS_EDITOR_URL}
18-
VITE_IMAGERY_SCHEMA: ${WS_IMAGERY_SCHEMA_URL}
19-
VITE_IMAGERY_EXAMPLE_URL: ${WS_IMAGERY_EXAMPLE_URL}
20-
VITE_LONG_FORM_QUEST_SCHEMA: ${WS_LONG_FORM_QUEST_SCHEMA_URL}
21-
VITE_LONG_FORM_QUEST_EXAMPLE_URL: ${WS_LONG_FORM_QUEST_EXAMPLE_URL}
22-
CODE_VERSION: ${CODE_VERSION}
2310

2411
frontend_tag:
2512
extends: frontend
@@ -33,7 +20,6 @@ services:
3320
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-rapid:buildcache
3421
cache_to:
3522
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-rapid:buildcache,mode=max
36-
context: rapid
3723

3824
rapid_tag:
3925
extends: rapid
@@ -47,7 +33,6 @@ services:
4733
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-pathways-editor:buildcache
4834
cache_to:
4935
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-pathways-editor:buildcache,mode=max
50-
context: pathways-editor
5136

5237
pathways-editor_tag:
5338
extends: pathways-editor
@@ -61,7 +46,6 @@ services:
6146
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-osm-log-proxy:buildcache
6247
cache_to:
6348
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-osm-log-proxy:buildcache,mode=max
64-
context: osm-log-proxy
6549

6650
osm-log-proxy_tag:
6751
extends: osm-log-proxy
@@ -75,7 +59,6 @@ services:
7559
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-osm-web:buildcache
7660
cache_to:
7761
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-osm-web:buildcache,mode=max
78-
context: osm-web
7962

8063
osm-web_tag:
8164
extends: osm-web
@@ -84,36 +67,11 @@ services:
8467
# OSM website/OSM API
8568
osm-rails:
8669
image: ${WS_DOCKER_REGISTRY}/workspaces-osm-rails:${ENV}
87-
environment:
88-
RAILS_ENV: production
89-
SECRET_KEY_BASE: ${WS_OSM_SECRET_KEY_BASE}
90-
WS_OSM_HOST: ${WS_OSM_HOST}
91-
WS_OSM_DB_HOST: ${WS_OSM_DB_HOST}
92-
WS_OSM_DB_USER: ${WS_OSM_DB_USER}
93-
WS_OSM_DB_PASS: ${WS_OSM_DB_PASS}
94-
WS_OSM_DB_NAME: ${WS_OSM_DB_NAME}
95-
WS_MAIL_NAME: ${WS_MAIL_NAME}
96-
WS_MAIL_FROM: ${WS_MAIL_FROM}
97-
WS_MAIL_CONTACT: ${WS_MAIL_CONTACT}
98-
WS_MAIL_RETURN_PATH: ${WS_MAIL_RETURN_PATH}
99-
WS_SMTP_DOMAIN: ${WS_SMTP_DOMAIN}
100-
WS_SMTP_HOST: ${WS_SMTP_HOST}
101-
WS_SMTP_PORT: ${WS_SMTP_PORT}
102-
WS_SMTP_USER: ${WS_SMTP_USER}
103-
WS_SMTP_PASS: ${WS_SMTP_PASS}
104-
PIDFILE: /tmp/pids/server.pid
10570
build:
106-
args:
107-
WS_OSM_DB_HOST: ${WS_OSM_DB_HOST}
108-
WS_OSM_DB_USER: ${WS_OSM_DB_USER}
109-
WS_OSM_DB_PASS: ${WS_OSM_DB_PASS}
110-
WS_OSM_DB_NAME: ${WS_OSM_DB_NAME}
11171
cache_from:
11272
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-osm-rails:buildcache
11373
cache_to:
11474
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-osm-rails:buildcache,mode=max
115-
context: osm-rails
116-
dockerfile: Dockerfile.prod
11775

11876
osm-rails_tag:
11977
extends: osm-rails
@@ -127,32 +85,11 @@ services:
12785
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-osm-cgimap:buildcache
12886
cache_to:
12987
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-osm-cgimap:buildcache,mode=max
130-
context: osm-cgimap
131-
dockerfile: docker/ubuntu/Dockerfile2404
13288

13389
osm-cgimap_tag:
13490
extends: osm-cgimap
13591
image: ${WS_DOCKER_REGISTRY}/workspaces-osm-cgimap:${CODE_VERSION}
13692

137-
# tasking manager
138-
# tasks-frontend:
139-
# image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${ENV}
140-
# build:
141-
# cache_from:
142-
# - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:buildcache
143-
# cache_to:
144-
# - type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:buildcache,mode=max
145-
# context: tasking-manager
146-
# dockerfile: ./scripts/docker/Dockerfile.frontend
147-
# args:
148-
# TM_APP_API_URL: ${WS_TASKS_URL}
149-
# #TM_CONSUMER_KEY
150-
# #TM_CONSUMER_SECRET
151-
152-
# tasks-frontend_tag:
153-
# extends: tasks-frontend
154-
# image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${CODE_VERSION}
155-
15693
# tasking manager
15794
tasks-backend:
15895
image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:${ENV}
@@ -161,7 +98,6 @@ services:
16198
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:buildcache
16299
cache_to:
163100
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:buildcache,mode=max
164-
context: tasking-manager
165101

166102
tasks-backend_tag:
167103
extends: tasks-backend
@@ -175,13 +111,6 @@ services:
175111
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-leaderboard-frontend:buildcache
176112
cache_to:
177113
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-leaderboard-frontend:buildcache,mode=max
178-
context: ./leaderboard/frontend
179-
dockerfile: Dockerfile
180-
args:
181-
VITE_TDEI_API_URL: ${WS_TDEI_API_URL}
182-
VITE_TDEI_USER_API_URL: ${WS_TDEI_BACKEND_URL}
183-
VITE_API_URL: ${WS_API_URL}
184-
VITE_OSM_URL: ${WS_OSM_URL}
185114

186115
leaderboard-frontend_tag:
187116
extends: leaderboard-frontend
@@ -194,8 +123,6 @@ services:
194123
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-leaderboard-backend:buildcache
195124
cache_to:
196125
- type=registry,ref=${WS_DOCKER_REGISTRY}/workspaces-leaderboard-backend:buildcache,mode=max
197-
context: ./leaderboard/backend
198-
dockerfile: Dockerfile
199126

200127
leaderboard-backend_tag:
201128
extends: leaderboard-backend

docker-compose.deploy.yml renamed to docker-compose.override.deploy.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ services:
5959
frontend:
6060
image: ${WS_DOCKER_REGISTRY}/workspaces-frontend:${WS_DOCKER_TAG}
6161
restart: always
62+
environment:
63+
6264
labels:
6365
- traefik.enable=true
6466
- traefik.http.routers.frontend.rule=Host(`${WS_FRONTEND_HOST}`)
@@ -206,6 +208,11 @@ services:
206208
leaderboard-frontend:
207209
image: ${WS_DOCKER_REGISTRY}/workspaces-leaderboard-frontend:${WS_DOCKER_TAG}
208210
restart: always
211+
environment:
212+
VITE_TDEI_API_URL: ${WS_TDEI_API_URL}
213+
VITE_TDEI_USER_API_URL: ${WS_TDEI_BACKEND_URL}
214+
VITE_API_URL: ${WS_API_URL}
215+
VITE_OSM_URL: ${WS_OSM_URL}
209216
labels:
210217
- traefik.enable=true
211218
- traefik.http.routers.leaderboard-frontend.rule=Host(`${LB_FRONTEND_HOST}`)

‎docker-compose.yml‎

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,27 @@ services:
134134
<<: *osm-rails-base
135135
command: bundle exec rails s -p 3000 -b '0.0.0.0'
136136
environment:
137-
PIDFILE: /tmp/pids/server.pid
137+
RAILS_ENV: production
138+
SECRET_KEY_BASE: ${WS_OSM_SECRET_KEY_BASE}
139+
WS_OSM_HOST: ${WS_OSM_HOST}
140+
WS_MAIL_NAME: ${WS_MAIL_NAME}
141+
WS_MAIL_FROM: ${WS_MAIL_FROM}
142+
WS_MAIL_CONTACT: ${WS_MAIL_CONTACT}
143+
WS_MAIL_RETURN_PATH: ${WS_MAIL_RETURN_PATH}
144+
WS_SMTP_DOMAIN: ${WS_SMTP_DOMAIN}
145+
WS_SMTP_HOST: ${WS_SMTP_HOST}
146+
WS_SMTP_PORT: ${WS_SMTP_PORT}
147+
WS_SMTP_USER: ${WS_SMTP_USER}
148+
WS_SMTP_PASS: ${WS_SMTP_PASS}
149+
PIDFILE: /tmp/pids/server.pid
138150
tmpfs: /tmp/pids/
139-
151+
build:
152+
args:
153+
WS_OSM_DB_HOST: ${WS_OSM_DB_HOST}
154+
WS_OSM_DB_USER: ${WS_OSM_DB_USER}
155+
WS_OSM_DB_PASS: ${WS_OSM_DB_PASS}
156+
WS_OSM_DB_NAME: ${WS_OSM_DB_NAME}
157+
140158
osm-rails-worker:
141159
<<: *osm-rails-base
142160
command: bundle exec rake jobs:work
@@ -156,17 +174,6 @@ services:
156174
CGIMAP_MAP_NODES: ${WS_OSM_MAX_EXPORT_NODES}
157175
CGIMAP_MAP_AREA: ${WS_OSM_MAX_EXPORT_AREA}
158176

159-
# tasks-frontend:
160-
# build:
161-
# context: tasking-manager
162-
# dockerfile: ./scripts/docker/Dockerfile.frontend
163-
# volumes:
164-
# - ./tasking-manager:/usr/src/app
165-
# labels:
166-
# - traefik.enable=true
167-
# - traefik.http.routers.tasks-frontend.rule=Host(`${WS_TASKS_HOST}`)
168-
# - traefik.http.services.tasks-frontend.loadbalancer.server.port=80
169-
170177
tasks-backend:
171178
build:
172179
context: tasking-manager
@@ -196,6 +203,16 @@ services:
196203
- traefik.http.services.workspaces-backend.loadbalancer.server.port=5000
197204
- traefik.http.routers.workspaces-backend.middlewares=workspaces-backend-emulation
198205

206+
leaderboard-frontend:
207+
build:
208+
context: ./leaderboard/frontend
209+
dockerfile: Dockerfile
210+
211+
leaderboard-backend:
212+
build:
213+
context: ./leaderboard/backend
214+
dockerfile: Dockerfile
215+
199216
volumes:
200217
osm-rails-tmp:
201218
osm-rails-storage:

‎tdei_uw.env‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ WS_PLATFORM_WEBSITE=https://sidewalks.washington.edu/
2424
WS_PLATFORM_ORG_WEBSITE=https://tcat.cs.washington.edu/
2525
WS_PLATFORM_PRIVACY_POLICY=https://sidewalks.washington.edu/privacy
2626

27+
SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN}
28+
SENTRY_DSN=${SENTRY_DSN}
29+
2730
###############################################################################
2831
# Web
2932
###############################################################################

0 commit comments

Comments
 (0)