Skip to content

Commit 65552d4

Browse files
Fix
1 parent e5e930f commit 65552d4

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

.github/workflows/azure-marketplace.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,20 @@ jobs:
5454
./get_helm.sh
5555
- name: Login to Azure
5656
env:
57-
AZURE_ACR_REGISTRY_STAGING: ${{ fromJSON(steps.secrets.outputs.vault).AZURE_ACR_REGISTRY_STAGING }}
57+
AZURE_ACR_REGISTRY: ${{ fromJSON(steps.secrets.outputs.vault).AZURE_ACR_REGISTRY_STAGING }}
5858
AZURE_ACR_USERNAME: ${{ fromJSON(steps.secrets.outputs.vault).AZURE_ACR_USERNAME }}
5959
AZURE_ACR_PASSWORD: ${{ fromJSON(steps.secrets.outputs.vault).AZURE_ACR_PASSWORD }}
6060
run: |
61-
echo "${AZURE_ACR_PASSWORD}" | docker login "${AZURE_ACR_REGISTRY_STAGING}" --username "${AZURE_ACR_USERNAME}" --password-stdin
61+
echo "${AZURE_ACR_PASSWORD}" | docker login "${AZURE_ACR_REGISTRY}" --username "${AZURE_ACR_USERNAME}" --password-stdin
6262
- name: Pull required images
6363
run: |
6464
docker pull "docker.io/sonarqube:${SQ_IMAGE_VERSION}-enterprise"
6565
docker pull "docker.io/bitnamilegacy/postgresql:${PSQL_VERSION}"
6666
- name: Make script executable
6767
run: chmod +x ./.github/scripts/azure_app_verify_and_publish.sh
6868
- name: Build app
69+
env:
70+
AZURE_ACR_REGISTRY: ${{ fromJSON(steps.secrets.outputs.vault).AZURE_ACR_REGISTRY_STAGING }}
6971
run: ./.github/scripts/azure_app_verify_and_publish.sh
7072

7173
build-azure-prod-app:
@@ -97,16 +99,18 @@ jobs:
9799
./get_helm.sh
98100
- name: Login to Azure
99101
env:
100-
AZURE_ACR_REGISTRY_PRODUCTION: ${{ fromJSON(steps.secrets.outputs.vault).AZURE_ACR_REGISTRY_PRODUCTION }}
102+
AZURE_ACR_REGISTRY: ${{ fromJSON(steps.secrets.outputs.vault).AZURE_ACR_REGISTRY_PRODUCTION }}
101103
AZURE_ACR_USERNAME: ${{ fromJSON(steps.secrets.outputs.vault).AZURE_ACR_USERNAME }}
102104
AZURE_ACR_PASSWORD: ${{ fromJSON(steps.secrets.outputs.vault).AZURE_ACR_PASSWORD }}
103105
run: |
104-
echo "${AZURE_ACR_PASSWORD}" | docker login "${AZURE_ACR_REGISTRY_PRODUCTION}" --username "${AZURE_ACR_USERNAME}" --password-stdin
106+
echo "${AZURE_ACR_PASSWORD}" | docker login "${AZURE_ACR_REGISTRY}" --username "${AZURE_ACR_USERNAME}" --password-stdin
105107
- name: Pull required images
106108
run: |
107109
docker pull "docker.io/sonarqube:${SQ_IMAGE_VERSION}-enterprise"
108110
docker pull "docker.io/bitnamilegacy/postgresql:${PSQL_VERSION}"
109111
- name: Make script executable
110112
run: chmod +x ./.github/scripts/azure_app_verify_and_publish.sh
111113
- name: Build app
114+
env:
115+
AZURE_ACR_REGISTRY: ${{ fromJSON(steps.secrets.outputs.vault).AZURE_ACR_REGISTRY_PRODUCTION }}
112116
run: ./.github/scripts/azure_app_verify_and_publish.sh

0 commit comments

Comments
 (0)