Merge branch 'main' into eljog/tool-for-generating-image-release-changes

devcontainers · Dec 6, 2023 · 1200d60 · 1200d60
2 parents 27c416d + 804db60
commit 1200d60
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/push-dev.yml b/.github/workflows/push-dev.yml
@@ -5,6 +5,11 @@ on:
   schedule:
     - cron: '0 14 * * MON'
 
+permissions:
+  id-token: write
+  contents: write
+  pull-requests: write
+
 jobs:
   build-and-push:
     name: Build and push
@@ -15,6 +20,7 @@ jobs:
         page-total: [66]
       fail-fast: false
     runs-on: devcontainer-image-builder-ubuntu
+    environment: documentation
     steps:
     - name: Free more space
       id: free_space 
@@ -33,7 +39,9 @@ jobs:
       id: az_login
       uses: azure/login@v1
       with:
-        creds: ${{ secrets.AZ_ACR_CREDS }}
+        client-id: ${{ secrets.AZURE_CLIENT_ID }}
+        tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+        subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
     - name: Build and push dev tags
       id: build_and_push

diff --git a/.github/workflows/version-history.yml b/.github/workflows/version-history.yml
@@ -52,7 +52,9 @@ jobs:
       id: az_login
       uses: azure/login@v1
       with:
-        creds: ${{ secrets.AZ_ACR_CREDS }}
+        client-id: ${{ secrets.AZURE_CLIENT_ID }}
+        tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+        subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
     - name: Get image info
       id: Get_image_info