Skip to content

Commit 2acd308

Browse files
authored
bytter til build-push-docker-image fra sif-gha-workflows (#6969)
* bytter til build-push-docker-image fra sif-gha-workflows * additional tag for dev-next1 * trenger ikke image base name
1 parent bd7bf83 commit 2acd308

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/workflows/deploy-docker-image.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,14 @@ jobs:
3939
env:
4040
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
4141

42-
- uses: nais/docker-build-push@v0
42+
- name: Build and push to docker registry
43+
uses: navikt/sif-gha-workflows/.github/actions/maven/build-push-docker-image@main
4344
id: docker-push
4445
with:
45-
tag: 'latest'
46-
team: k9saksbehandling
46+
without_navikt_prefix: true
4747
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
4848
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
49+
push-image: true
4950
- name: Sett image for nais deploy
5051
run: |
5152
echo "IMAGE=${{steps.docker-push.outputs.image}}" >> $GITHUB_OUTPUT
@@ -67,7 +68,7 @@ jobs:
6768
needs: build-docker-image
6869
with:
6970
tag: ${{ needs.build-docker-image.outputs.tag }}
70-
suites: "frontend"
71+
suites: 'frontend'
7172
image_version: ${{ needs.build-docker-image.outputs.tag }}
7273

7374
trivy:

.github/workflows/dev-next1-deploy.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ jobs:
3030
run: yarn build
3131

3232
- name: Build and push to docker registry
33-
uses: nais/docker-build-push@v0
33+
uses: navikt/sif-gha-workflows/.github/actions/maven/build-push-docker-image@main
3434
id: docker-push
3535
with:
36-
tag: 'dev-next1'
37-
team: k9saksbehandling
36+
additional-tag: 'dev-next1'
37+
without_navikt_prefix: true
3838
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
3939
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
40+
push-image: true
4041
- name: Deploy to nais
4142
uses: nais/deploy/actions/deploy@v2
4243
env:

0 commit comments

Comments
 (0)