Skip to content

Commit d0e8729

Browse files
aaronskibaaaronskiba
committed
Update docker-push workflows naming
Renamed api to app Renamed web to assets
1 parent 64f8f8c commit d0e8729

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

‎.github/workflows/docker-push-image.yml

+19-19
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ jobs:
2828
username: ${{ secrets.DOCKER_USERNAME }}
2929
password: ${{ secrets.DOCKER_PASSWORD }}
3030

31-
# Extract metadata for api image
32-
- name: Extract metadata (tags) for Docker api Image
33-
id: meta_api
31+
# Extract metadata for app image
32+
- name: Extract metadata (tags) for Docker app Image
33+
id: meta_app
3434
uses: docker/metadata-action@v3
3535
with:
3636
images: ualbertalib/dmp_roadmap
3737
flavor: |
3838
latest=false
39-
suffix=-api
39+
suffix=-app
4040
# conditional tagging based on release type
4141
# prerelease corresponds to staging, latest to production
4242
tags: |
@@ -45,15 +45,15 @@ jobs:
4545
(!github.event.release.prerelease &&
4646
'type=match,pattern=.+portage-(\d+\.\d+\.\d+)$,group=1') }}
4747
48-
# Extract metadata for web image
49-
- name: Extract metadata (tags) for Docker web image
50-
id: meta_web
48+
# Extract metadata for assets image
49+
- name: Extract metadata (tags) for Docker assets image
50+
id: meta_assets
5151
uses: docker/metadata-action@v3
5252
with:
5353
images: ualbertalib/dmp_roadmap
5454
flavor: |
5555
latest=false
56-
suffix=-web
56+
suffix=-assets
5757
# conditional tagging based on release type
5858
# prerelease corresponds to staging, latest to production
5959
tags: |
@@ -63,31 +63,31 @@ jobs:
6363
'type=match,pattern=.+portage-(\d+\.\d+\.\d+)$,group=1') }}
6464
6565
66-
- name: Build and push the api stage image
66+
- name: Build and push the app stage image
6767
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
6868
with:
6969
context: .
7070
file: Dockerfile.production
71-
target: api
71+
target: app
7272
push: true
7373
tags: |
74-
${{ steps.meta_api.outputs.tags }}
74+
${{ steps.meta_app.outputs.tags }}
7575
# Fetch existing build cache from Docker Hub, if available
76-
cache-from: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-api
76+
cache-from: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-app
7777
# Push the updated build cache to Docker Hub
78-
cache-to: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-api,mode=max
78+
cache-to: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-app,mode=max
7979

80-
- name: Build and push the web stage image
80+
- name: Build and push the assets stage image
8181
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
8282
with:
8383
context: .
8484
file: Dockerfile.production
85-
target: web
85+
target: assets
8686
push: true
8787
tags: |
88-
${{ steps.meta_web.outputs.tags }}
88+
${{ steps.meta_assets.outputs.tags }}
8989
# Fetch existing build cache from Docker Hub, if available
90-
# else, built `api` layer will be used as a fallback cache
91-
cache-from: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-web
90+
# else, built `app` layer will be used as a fallback cache
91+
cache-from: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-assets
9292
# Push the updated build cache to Docker Hub
93-
cache-to: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-web,mode=max
93+
cache-to: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-assets,mode=max

‎.github/workflows/docker-push-uat-image.yml

+19-19
Original file line numberDiff line numberDiff line change
@@ -28,55 +28,55 @@ jobs:
2828
username: ${{ secrets.DOCKER_USERNAME }}
2929
password: ${{ secrets.DOCKER_PASSWORD }}
3030

31-
# Extract metadata for api image
32-
- name: Extract metadata (tags) for Docker api Image
33-
id: meta_api
31+
# Extract metadata for app image
32+
- name: Extract metadata (tags) for Docker app Image
33+
id: meta_app
3434
uses: docker/metadata-action@v3
3535
with:
3636
images: ualbertalib/dmp_roadmap
3737
flavor: |
38-
suffix=-api,onlatest=true
38+
suffix=-app,onlatest=true
3939
tags: |
4040
type=match,pattern=.+portage-(\d+\.\d+\.\d+-uat-\d+),group=1
4141
type=raw,value=uat
4242
43-
# Extract metadata for web image
44-
- name: Extract metadata (tags) for Docker web image
45-
id: meta_web
43+
# Extract metadata for assets image
44+
- name: Extract metadata (tags) for Docker assets image
45+
id: meta_assets
4646
uses: docker/metadata-action@v3
4747
with:
4848
images: ualbertalib/dmp_roadmap
4949
flavor: |
50-
suffix=-web,onlatest=true
50+
suffix=-assets,onlatest=true
5151
tags: |
5252
type=match,pattern=.+portage-(\d+\.\d+\.\d+-uat-\d+),group=1
5353
type=raw,value=uat
5454
55-
- name: Build and push the api stage image
55+
- name: Build and push the app stage image
5656
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
5757
with:
5858
context: .
5959
file: Dockerfile.production
60-
target: api
60+
target: app
6161
push: true
6262
tags: |
63-
${{ steps.meta_api.outputs.tags }}
63+
${{ steps.meta_app.outputs.tags }}
6464
# Fetch existing build cache from Docker Hub, if available
65-
cache-from: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-api
65+
cache-from: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-app
6666
# Push the updated build cache to Docker Hub
67-
cache-to: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-api,mode=max
67+
cache-to: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-app,mode=max
6868

69-
- name: Build and push the web stage image
69+
- name: Build and push the assets stage image
7070
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
7171
with:
7272
context: .
7373
file: Dockerfile.production
74-
target: web
74+
target: assets
7575
push: true
7676
tags: |
77-
${{ steps.meta_web.outputs.tags }}
77+
${{ steps.meta_assets.outputs.tags }}
7878
# Fetch existing build cache from Docker Hub, if available
79-
# else, built `api` layer will be used as a fallback cache
80-
cache-from: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-web
79+
# else, built `app` layer will be used as a fallback cache
80+
cache-from: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-assets
8181
# Push the updated build cache to Docker Hub
82-
cache-to: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-web,mode=max
82+
cache-to: type=registry,ref=ualbertalib/dmp_roadmap:build-cache-assets,mode=max

0 commit comments

Comments
 (0)