Skip to content

Commit

Permalink
modified: .github/workflows/apply_on_push.yaml
Browse files Browse the repository at this point in the history
	modified:   .github/workflows/build_and_push_images.yaml
  • Loading branch information
vrsorheim committed Jul 5, 2024
1 parent 61e3e25 commit 90ad8bc
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/apply_on_push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ jobs:
id: apply
run: terraform apply -auto-approve

- name: Log in to ACR
run: az acr login --name crimomsw
# - name: Log in to ACR
# run: az acr login --name crimomsw

- name: Build and push Client Docker image
run: |
pwd && docker buildx build --push --tag crimomsw.azurecr.io/client:${{ github.sha }} ../IMOMaritimeSingleWindow/Client
- name: Build and push Server Docker image
run: |
pwd && docker buildx build --push --tag crimomsw.azurecr.io/server:${{ github.sha }} ../IMOMaritimeSingleWindow/Server
# - name: Build and push Client Docker image
# run: |
# pwd && docker buildx build --push --tag crimomsw.azurecr.io/client:${{ github.sha }} ../IMOMaritimeSingleWindow/Client
# - name: Build and push Server Docker image
# run: |
# pwd && docker buildx build --push --tag crimomsw.azurecr.io/server:${{ github.sha }} ../IMOMaritimeSingleWindow/Server


11 changes: 5 additions & 6 deletions .github/workflows/build_and_push_images.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
name: Build and Push Images

on:
workflow_run:
workflows: ["Apply On Push Infrastructure Terraform"]
types:
- completed
push:
branches:
- deploy-infra-terraformv2

permissions:
id-token: write
Expand All @@ -27,8 +26,8 @@ jobs:
working-directory: ./terraform

steps:
# - name: Checkout
# uses: actions/checkout@v4
- name: Checkout
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
Expand Down

0 comments on commit 90ad8bc

Please sign in to comment.