bytter til google artifact registry 🎉

Co-authored-by: Erik Maximilian Forsman <[email protected]>
navikt · Jan 11, 2024 · 525a47e · 525a47e
1 parent bd86efb
commit 525a47e
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 38 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -27,7 +27,7 @@ jobs:
       - name: create docker tag
         run: echo "TAG=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
     outputs:
-      image: ghcr.io/${{ github.repository }}/spleis:${{ env.TAG }}
+      tag: ${{ env.TAG }}
 
   build:
     name: build docker image
@@ -45,15 +45,21 @@ jobs:
       - name: test and build
         run: ./gradlew clean test build
       - name: build docker image
-        run: docker build -f Dockerfile sykepenger-mediators --pull -t ${{ needs.set_version.outputs.image }}
-      - name: push docker image
-        run: |
-          docker login ghcr.io --username "$GITHUB_REPOSITORY" -p ${{ secrets.GITHUB_TOKEN }}
-          docker push ${{ needs.set_version.outputs.image }}
+        uses: nais/docker-build-push@v0
+        id: docker-build-push
+        with:
+          team: tbd
+          image_suffix: spleis
+          tag: ${{ needs.set_version.outputs.tag }}
+          docker_context: sykepenger-mediators
+          project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
+          identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
+    outputs:
+      image: ${{ steps.docker-build-push.outputs.image }}
 
   deployDev:
     name: deploy to dev
-    needs: [set_version, build]
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -62,11 +68,11 @@ jobs:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: deploy/dev.yml,deploy/db-dev.yml
-          IMAGE: ${{ needs.set_version.outputs.image }}
+          IMAGE: ${{ needs.build.outputs.image }}
 
   deployProd:
     name: deploy to prod
-    needs: [set_version, build]
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -75,4 +81,4 @@ jobs:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: deploy/prod.yml,deploy/hpa.yml,deploy/db-prod.yml
-          IMAGE: ${{ needs.set_version.outputs.image }}
+          IMAGE: ${{ needs.build.outputs.image }}
diff --git a/.github/workflows/spleis-api.yml b/.github/workflows/spleis-api.yml
@@ -24,7 +24,7 @@ jobs:
       - name: create docker tag
         run: echo "TAG=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
     outputs:
-      image: ghcr.io/${{ github.repository }}/spleis-api:${{ env.TAG }}
+      tag: ${{ env.TAG }}
 
   build:
     name: build docker image
@@ -42,15 +42,21 @@ jobs:
       - name: test and build
         run: ./gradlew :sykepenger-api:test :sykepenger-api:build
       - name: build docker image
-        run: docker build -f Dockerfile sykepenger-api --pull -t ${{ needs.set_version.outputs.image }}
-      - name: push docker image
-        run: |
-          docker login ghcr.io --username "$GITHUB_REPOSITORY" -p ${{ secrets.GITHUB_TOKEN }}
-          docker push ${{ needs.set_version.outputs.image }}
+        uses: nais/docker-build-push@v0
+        id: docker-build-push
+        with:
+          team: tbd
+          image_suffix: api
+          tag: ${{ needs.set_version.outputs.tag }}
+          docker_context: sykepenger-api
+          project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
+          identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
+    outputs:
+      image: ${{ steps.docker-build-push.outputs.image }}
 
   deployDev:
     name: deploy to dev
-    needs: [set_version, build]
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -59,11 +65,11 @@ jobs:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: deploy/dev-api.yml
-          IMAGE: ${{ needs.set_version.outputs.image }}
+          IMAGE: ${{ needs.build.outputs.image }}
 
   deployProd:
     name: deploy to prod
-    needs: [set_version, build]
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -72,4 +78,4 @@ jobs:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: deploy/prod-api.yml
-          IMAGE: ${{ needs.set_version.outputs.image }}
+          IMAGE: ${{ needs.build.outputs.image }}
diff --git a/.github/workflows/spleis-jobs.yml b/.github/workflows/spleis-jobs.yml
@@ -24,7 +24,7 @@ jobs:
       - name: create docker tag
         run: echo "TAG=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
     outputs:
-      image: ghcr.io/${{ github.repository }}/spleis-jobs:${{ env.TAG }}
+      tag: ${{ env.TAG }}
 
   build:
     name: build docker image
@@ -42,15 +42,21 @@ jobs:
       - name: test and build
         run: ./gradlew :jobs:test :jobs:build
       - name: build docker image
-        run: docker build -f Dockerfile jobs --pull -t ${{ needs.set_version.outputs.image }}
-      - name: push docker image
-        run: |
-          docker login ghcr.io --username "$GITHUB_REPOSITORY" -p ${{ secrets.GITHUB_TOKEN }}
-          docker push ${{ needs.set_version.outputs.image }}
+        uses: nais/docker-build-push@v0
+        id: docker-build-push
+        with:
+          team: tbd
+          image_suffix: jobs
+          tag: ${{ needs.set_version.outputs.tag }}
+          docker_context: jobs
+          project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
+          identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
+    outputs:
+      image: ${{ steps.docker-build-push.outputs.image }}
 
   deployDev:
       name: deploy to dev
-      needs: [set_version, build]
+      needs: build
       runs-on: ubuntu-latest
       steps:
           - uses: actions/checkout@v3
@@ -59,11 +65,11 @@ jobs:
                 APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
                 CLUSTER: dev-gcp
                 RESOURCE: deploy/dev-avstemming-job.yml
-                IMAGE: ${{ needs.set_version.outputs.image }}
+                IMAGE: ${{ needs.build.outputs.image }}
 
   deployProd:
       name: deploy to prod
-      needs: [set_version, build]
+      needs: build
       runs-on: ubuntu-latest
       steps:
           - uses: actions/checkout@v3
@@ -72,4 +78,4 @@ jobs:
                 APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
                 CLUSTER: prod-gcp
                 RESOURCE: deploy/prod-avstemming-job.yml
-                IMAGE: ${{ needs.set_version.outputs.image }}
+                IMAGE: ${{ needs.build.outputs.image }}
diff --git a/.github/workflows/spleis-opprydding-dev.yml b/.github/workflows/spleis-opprydding-dev.yml
@@ -22,7 +22,7 @@ jobs:
       - name: create docker tag
         run: echo "TAG=$(echo ${{ github.sha }} | cut -c1-7)" >> $GITHUB_ENV
     outputs:
-      image: ghcr.io/${{ github.repository }}/spleis-opprydding-dev:${{ env.TAG }}
+      tag: ${{ env.TAG }}
 
   build:
     name: build docker image
@@ -40,15 +40,21 @@ jobs:
       - name: test and build
         run: ./gradlew :sykepenger-opprydding-dev:test :sykepenger-opprydding-dev:build
       - name: build docker image
-        run: docker build -f Dockerfile sykepenger-opprydding-dev --pull -t ${{ needs.set_version.outputs.image }}
-      - name: push docker image
-        run: |
-          docker login ghcr.io --username "$GITHUB_REPOSITORY" -p ${{ secrets.GITHUB_TOKEN }}
-          docker push ${{ needs.set_version.outputs.image }}
+        uses: nais/docker-build-push@v0
+        id: docker-build-push
+        with:
+          team: tbd
+          image_suffix: sykepenger-opprydding-dev
+          tag: ${{ needs.set_version.outputs.tag }}
+          docker_context: sykepenger-opprydding-dev
+          project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
+          identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
+    outputs:
+      image: ${{ steps.docker-build-push.outputs.image }}
 
   deployDev:
     name: deploy to dev
-    needs: [set_version, build]
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -57,4 +63,4 @@ jobs:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: deploy/dev-opprydding.yml
-          IMAGE: ${{ needs.set_version.outputs.image }}
+          IMAGE: ${{ needs.build.outputs.image }}