GAR push og pull

navikt · Sep 10, 2023 · 4f93800 · 4f93800
1 parent 7bf3258
commit 4f93800
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,6 +24,7 @@ jobs:
     permissions:
       contents: read
       packages: write
+      id-token: write
     uses: navikt/fp-gha-workflows/.github/workflows/build-app-postgres.yml@main
     with:
       postgres-user: fpabakus_unit
@@ -95,21 +96,27 @@ jobs:
 
   deploy-dev:
     name: Deploy dev
+    permissions:
+      id-token: write
     if: github.ref_name == 'master'
     needs: [build-app, fpsak-tester, verdikjede-tester]
     uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
     with:
-      image: ghcr.io/${{ github.repository }}:${{ needs.build-app.outputs.build-version }}
+      gar: true
+      image: ${{ needs.build-app.outputs.build-version }}
       cluster: dev-fss
     secrets: inherit
 
   deploy-prod:
     name: Deploy prod
+    permissions:
+      id-token: write
     if: github.ref_name == 'master'
     needs: [build-app, fpsak-tester, verdikjede-tester, deploy-dev]
     uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
     with:
-      image: ghcr.io/${{ github.repository }}:${{ needs.build-app.outputs.build-version }}
+      gar: true
+      image: ${{ needs.build-app.outputs.build-version }}
       cluster: prod-fss
     secrets: inherit
 

diff --git a/.github/workflows/deploy-manuelt.yml b/.github/workflows/deploy-manuelt.yml
@@ -17,8 +17,11 @@ on:
 jobs:
   deploy:
     name: Deploy dev
+    permissions:
+      id-token: write
     uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
     with:
-      image: ghcr.io/${{ github.repository }}:${{ inputs.image }}
+      gar: true
+      image: ${{ inputs.image }}
       cluster: ${{ inputs.environment }}-fss
     secrets: inherit