Skip to content

Commit a472659

Browse files
committed
Update build-v2.yaml
1 parent ae12378 commit a472659

File tree

1 file changed

+30
-3
lines changed

1 file changed

+30
-3
lines changed

.github/workflows/build-v2.yaml

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ jobs:
1818
with:
1919
submodules: recursive
2020

21-
- name: Set commit SHA as code version
22-
run: echo "CODE_VERSION=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
23-
2421
# - name: Generate release notes
2522
# run:
2623
# ./gen-rel-notes.sh > CHANGELOG
@@ -33,6 +30,9 @@ jobs:
3330
environment: "dev"
3431
timeout-minutes: 45
3532
steps:
33+
- name: Set commit SHA as code version
34+
run: echo "CODE_VERSION=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
35+
3636
- uses: docker/login-action@v3
3737
with:
3838
registry: ${{ vars.WS_DOCKER_REGISTRY }}
@@ -46,6 +46,9 @@ jobs:
4646
push: true
4747
file: Dockerfile
4848
tags: ${WS_DOCKER_REGISTRY}/workspaces-frontend:${ENV}, ${WS_DOCKER_REGISTRY}/workspaces-frontend:${CODE_VERSION}
49+
env:
50+
ENV: ${{ vars.ENV }}
51+
WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
4952

5053
- name: Build osm-cgimap
5154
uses: docker/build-push-action@v6
@@ -54,6 +57,9 @@ jobs:
5457
push: true
5558
file: docker/ubuntu/Dockerfile2404
5659
tags: ${WS_DOCKER_REGISTRY}/workspaces-osm-cgimap:${ENV}, ${WS_DOCKER_REGISTRY}/workspaces-osm-cgimap:${CODE_VERSION}
60+
env:
61+
ENV: ${{ vars.ENV }}
62+
WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
5763

5864
- name: Build osm-log-proxy
5965
uses: docker/build-push-action@v6
@@ -62,6 +68,9 @@ jobs:
6268
push: true
6369
file: Dockerfile
6470
tags: ${WS_DOCKER_REGISTRY}/workspaces-osm-log-proxy:${ENV}, ${WS_DOCKER_REGISTRY}/workspaces-osm-log-proxy:${CODE_VERSION}
71+
env:
72+
ENV: ${{ vars.ENV }}
73+
WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
6574

6675
- name: Build osm-rails
6776
uses: docker/build-push-action@v6
@@ -70,6 +79,9 @@ jobs:
7079
push: true
7180
file: Dockerfile.prod
7281
tags: ${WS_DOCKER_REGISTRY}/workspaces-osm-rails:${ENV}, ${WS_DOCKER_REGISTRY}/workspaces-osm-rails:${CODE_VERSION}
82+
env:
83+
ENV: ${{ vars.ENV }}
84+
WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
7385

7486
- name: Build osm-web
7587
uses: docker/build-push-action@v6
@@ -78,6 +90,9 @@ jobs:
7890
push: true
7991
file: Dockerfile
8092
tags: ${WS_DOCKER_REGISTRY}/workspaces-osm-web:${ENV}, ${WS_DOCKER_REGISTRY}/workspaces-osm-web:${CODE_VERSION}
93+
env:
94+
ENV: ${{ vars.ENV }}
95+
WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
8196

8297
- name: Build pathways-editor
8398
uses: docker/build-push-action@v6
@@ -86,6 +101,9 @@ jobs:
86101
push: true
87102
file: Dockerfile
88103
tags: ${WS_DOCKER_REGISTRY}/workspaces-pathways-editor:${ENV}, ${WS_DOCKER_REGISTRY}/workspaces-pathways-editor:${CODE_VERSION}
104+
env:
105+
ENV: ${{ vars.ENV }}
106+
WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
89107

90108
- name: Build rapid
91109
uses: docker/build-push-action@v6
@@ -94,6 +112,9 @@ jobs:
94112
push: true
95113
file: Dockerfile
96114
tags: ${WS_DOCKER_REGISTRY}/workspaces-rapid:${ENV}, ${WS_DOCKER_REGISTRY}/workspaces-rapid:${CODE_VERSION}
115+
env:
116+
ENV: ${{ vars.ENV }}
117+
WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
97118

98119
- name: Build tasks-backend
99120
uses: docker/build-push-action@v6
@@ -105,6 +126,9 @@ jobs:
105126
build-args: |
106127
APP_UID=1000
107128
tags: ${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:${ENV}, ${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:${CODE_VERSION}
129+
env:
130+
ENV: ${{ vars.ENV }}
131+
WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
108132

109133
- name: Build tasks-frontend
110134
uses: docker/build-push-action@v6
@@ -115,6 +139,9 @@ jobs:
115139
build-args: |
116140
TM_APP_API_URL="https://tasks.workspaces-${ENV}.sidewalks.washington.edu/"
117141
tags: ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${ENV}, ${WS_DOCKER_REGISTRY}/workspaces-tasks-frontend:${CODE_VERSION}
142+
env:
143+
ENV: ${{ vars.ENV }}
144+
WS_DOCKER_REGISTRY: ${{ vars.WS_DOCKER_REGISTRY }}
118145

119146
deploy:
120147
needs: build

0 commit comments

Comments
 (0)