Merge pull request #1720 from navikt/revert-migrering-til-gar

revert migrering til gar
navikt · Jul 24, 2024 · 74084a6 · 74084a6
2 parents ae9df1f + 0c7df5d
commit 74084a6
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 25 deletions.
diff --git a/.github/workflows/build_n_deploy_dev.yaml b/.github/workflows/build_n_deploy_dev.yaml
@@ -3,10 +3,15 @@ name: Build, push, and deploy app to dev
 on:
   workflow_dispatch:
 
+  env:
+    IMAGE: ghcr.io/navikt/familie-ef-soknad:${{ github.sha }}
+
 jobs:
   build:
     name: Build and push Docker container
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -32,17 +37,16 @@ jobs:
         run: |
           npm ci
           npm run build
-      - name: Push docker image to GAR and sign image
-        uses: nais/docker-build-push@v0
-        id: docker-build-push
-        with:
-          team: teamfamilie
-          identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
-          project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
-    outputs:
-      image: ${{ steps.docker-build-push.outputs.image }}
+      - name: Build and publish Docker image
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.READER_TOKEN }}
+        run: |
+          docker build . -t ${IMAGE}
+          echo ${GITHUB_TOKEN} | docker login ghcr.io --username ${GITHUB_REPOSITORY} --password-stdin
+          docker push ${IMAGE}
   deploy:
-    name: Deploy to dev
+    name: Deploy to NAIS
     needs: build
     runs-on: ubuntu-latest
     permissions:
@@ -55,4 +59,3 @@ jobs:
         env:
           CLUSTER: dev-gcp
           RESOURCE: nais-dev.yaml
-          IMAGE: ${{ needs.build.outputs.image }}
diff --git a/.github/workflows/build_n_deploy_prod.yaml b/.github/workflows/build_n_deploy_prod.yaml
@@ -5,14 +5,15 @@ on:
     branches:
       - 'main'
 
-permissions:
-  id-token: write
-  contents: read
+env:
+  IMAGE: ghcr.io/navikt/familie-ef-soknad:${{ github.sha }}
 
 jobs:
   build:
     name: Build and push Docker container
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -38,39 +39,39 @@ jobs:
         run: |
           npm ci
           npm run build
-      - name: Push docker image to GAR and sign image
-        uses: nais/docker-build-push@v0
-        id: docker-build-push
-        with:
-          team: teamfamilie
-          identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
-          project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
+      - name: Build and publish Docker image
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.READER_TOKEN }}
+        run: |
+          docker build . -t ${IMAGE}
+          echo ${GITHUB_TOKEN} | docker login ghcr.io --username ${GITHUB_REPOSITORY} --password-stdin
+          docker push ${IMAGE}
       - name: Post build failures to Slack
         if: failure()
         run: |
           curl -X POST --data "{m\"text\": \"Build av $GITHUB_REPOSITORY feilet - $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID\"}" $WEBHOOK_URL
         env:
           WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-    outputs:
-      image: ${{ steps.docker-build-push.outputs.image }}
   deploy:
     name: Deploy to NAIS
     needs: build
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
     steps:
       - uses: actions/checkout@v4
       - name: Deploy til dev-gcp
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: dev-gcp
           RESOURCE: nais-dev.yaml
-          IMAGE: ${{ needs.build.outputs.image }}
       - name: Deploy til prod-gcp
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: prod-gcp
           RESOURCE: nais-prod.yaml
-          IMAGE: ${{ needs.build.outputs.image }}
       - name: Post deploy failures to Slack
         if: failure()
         run: |