Skip to content

Commit 3f8069d

Browse files
committed
Oppgradere GHA bygg
1 parent ffd5269 commit 3f8069d

File tree

1 file changed

+22
-27
lines changed

1 file changed

+22
-27
lines changed

.github/workflows/dp-inntekt-api-deploy.yaml

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,37 @@ name: Build and deploy
22

33
on: [push]
44

5-
env:
6-
IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}
7-
85
jobs:
96
build:
7+
permissions:
8+
contents: "read"
9+
id-token: "write"
1010
name: Build and publish Docker image
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4.0.0
1414
- uses: actions/setup-java@v3
1515
with:
1616
distribution: temurin
1717
java-version: 17
1818

19-
- uses: gradle/gradle-build-action@v2
19+
- uses: gradle/gradle-build-action@v2.8.0
2020
with:
21-
# arguments: --configuration-cache
2221
arguments: check build
23-
24-
- name: Set up Docker Buildx
25-
uses: docker/setup-buildx-action@v2
26-
27-
- name: Login to GitHub Container Registry
28-
uses: docker/login-action@v2
22+
- uses: nais/docker-build-push@v0
23+
name: docker-build-push
24+
id: docker-build-push
2925
with:
30-
registry: ghcr.io
31-
username: ${{ github.repository_owner }}
32-
password: ${{ secrets.GITHUB_TOKEN }}
33-
34-
- name: Build and push
35-
uses: docker/build-push-action@v4
36-
with:
37-
context: .
38-
tags: ${{ env.IMAGE }}
39-
push: true
40-
cache-from: type=gha
41-
cache-to: type=gha,mode=max
26+
team: teamdagpenger
27+
tag: latest
28+
push_image: true # optional, default true
29+
dockerfile: Dockerfile # optional, default Dockerfile
30+
docker_context: . # optional, default .
31+
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
32+
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
33+
tag_latest: true # optional, default false
34+
outputs:
35+
image: ${{ steps.docker-build-push.outputs.image }}
4236

4337
deploy-dev:
4438
name: Deploy to dev
@@ -47,13 +41,14 @@ jobs:
4741
runs-on: ubuntu-latest
4842
environment: dev-fss
4943
steps:
50-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4.0.0
5145
- uses: nais/deploy/actions/deploy@v1
5246
env:
5347
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
5448
CLUSTER: dev-fss
5549
RESOURCE: nais/dev/nais.yaml,nais/grpc-svc.yaml
5650
VARS: nais/vars.yaml
51+
VAR: image=${{ needs.build.outputs.image }}
5752
PRINT_PAYLOAD: true
5853
deploy-prod:
5954
name: Deploy to Production
@@ -62,12 +57,12 @@ jobs:
6257
runs-on: ubuntu-latest
6358
environment: prod-fss
6459
steps:
65-
- uses: actions/checkout@v3
66-
60+
- uses: actions/[email protected]
6761
- uses: nais/deploy/actions/deploy@v1
6862
env:
6963
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
7064
CLUSTER: prod-fss
7165
RESOURCE: nais/prod/nais.yaml,nais/grpc-svc.yaml
7266
VARS: nais/vars.yaml
67+
VAR: image=${{ needs.build.outputs.image }}
7368
PRINT_PAYLOAD: true

0 commit comments

Comments
 (0)