Skip to content

Commit dedd746

Browse files
abhi-markanAbhi Markan
andauthored
fix(deployment): generic deployment script (#152)
## Introduction A generic deployment script ## Resolution * Refer to the `TARGET` and `VERSION` from GH environment variables. * Simplified YML scripts. --------- Co-authored-by: Abhi Markan <abhi.markan@ukexportfinance.gov.uk>
1 parent b79b65a commit dedd746

File tree

4 files changed

+540
-207
lines changed

4 files changed

+540
-207
lines changed

.github/workflows/deployment.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,23 @@ jobs:
8181
creds: ${{ secrets.AZURE_CREDENTIALS }}
8282

8383
- name: CLI 📝
84-
run: echo ACR=$(az acr show -n $(az resource list --resource-type 'Microsoft.ContainerRegistry/registries' --query '[0].name' -o tsv) --query loginServer | tr -d '"') >> $GITHUB_ENV
84+
run: |
85+
echo ACR=$(az acr show -n $(az resource list --resource-type 'Microsoft.ContainerRegistry/registries' --query '[0].name' -o tsv) --query loginServer -o tsv) >> $GITHUB_ENV
86+
echo ACR_USER=$(az acr show -n $(az resource list --resource-type 'Microsoft.ContainerRegistry/registries' --query '[0].name' -o tsv) --query name -o tsv) >> $GITHUB_ENV
8587
8688
- name: Defaults ✨
8789
uses: Azure/cli@v1.0.7
8890
with:
8991
inlineScript: |
9092
# Basic
9193
az configure --defaults location=${{ vars.REGION }}
92-
az configure --defaults group=${{ vars.RESOURCE }}
94+
az configure --defaults group=rg-${{ env.PRODUCT }}-${{ vars.TARGET }}-${{ vars.VERSION }}
9395
9496
- name: ACR 🔐
9597
uses: azure/docker-login@v1
9698
with:
9799
login-server: ${{ env.ACR }}
98-
username: ${{ secrets.ACR_USERNAME }}
100+
username: ${{ env.ACR_USER }}
99101
password: ${{ secrets.ACR_PASSWORD }}
100102

101103
- name: Artifacts 🗃️

.github/workflows/infrastructure.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ jobs:
261261
--name ca-${{ env.PRODUCT }}-mdm-${{ env.TARGET }}-${{ vars.VERSION }} \
262262
--environment cae-${{ env.PRODUCT }}-${{ env.TARGET }}-${{ vars.VERSION }} \
263263
--registry-server cr${{ env.PRODUCT }}${{ env.TARGET }}${{ vars.VERSION }}.azurecr.io \
264-
--registry-username $(az acr credential show -n cr${{ env.PRODUCT }}${{ env.TARGET }}${{ vars.VERSION }} --query username | tr -d '"') \
264+
--registry-username $(az acr credential show -n cr${{ env.PRODUCT }}${{ env.TARGET }}${{ vars.VERSION }} --query username -o tsv) \
265265
--cpu 1.0 \
266266
--memory 2.0Gi \
267267
--min-replicas 1 \

.husky/commit-msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ npx commitlint --edit $1
88
npx lint-staged
99

1010
printf "\n\n${YELLOW}Lint check 🎨${NC}\n\n"
11-
npm run lint
11+
npm run lint

0 commit comments

Comments
 (0)