Skip to content

Commit 9e2b792

Browse files
authored
Fix issue with ACR protect image step in publish phase (#3814)
1 parent 08f7cf0 commit 9e2b792

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

.github/workflows/create-release-official.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,18 @@ jobs:
6262
run: |
6363
container_id=${{env.container_id}}
6464
docker exec -e DOCKER_PUSH_TARGET "$container_id" task controller:docker-push-multiarch
65-
docker exec -e DOCKER_PUSH_TARGET -e DOCKER_REGISTRY "$container_id" task controller:acr-protect-image
6665
env:
6766
DOCKER_PUSH_TARGET: ${{ secrets.REGISTRY_PUBLIC }}
6867
DOCKER_REGISTRY: ${{ secrets.REGISTRY_LOGIN }}
68+
69+
- name: Protect image
70+
run: |
71+
container_id=${{env.container_id}}
72+
docker exec -e DOCKER_PUSH_TARGET -e DOCKER_REGISTRY -e AZURE_TENANT_ID -e AZURE_CLIENT_ID -e AZURE_CLIENT_SECRET -e AZURE_SUBSCRIPTION_ID "$container_id" task controller:acr-protect-image
73+
env:
74+
DOCKER_PUSH_TARGET: ${{ secrets.REGISTRY_PUBLIC }}
75+
DOCKER_REGISTRY: ${{ secrets.REGISTRY_LOGIN }}
76+
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
77+
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
78+
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
79+
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

Taskfile.yml

+2
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,8 @@ tasks:
448448
controller:acr-protect-image:
449449
desc: Protects an existing image in ACR from being updated or deleted
450450
dir: "{{.CONTROLLER_ROOT}}"
451+
deps:
452+
- az-login
451453
run: always
452454
cmds:
453455
- 'if [ -z "{{.DOCKER_PUSH_TARGET}}" ]; then echo "Error: DOCKER_PUSH_TARGET must be set"; exit 1; fi'

0 commit comments

Comments
 (0)