Skip to content

Commit a81436a

Browse files
authored
ci: bygges som en vanlig app
1 parent 325d2b6 commit a81436a

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

.github/workflows/main.yaml

+6-7
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ jobs:
3636
uses: gradle/actions/dependency-submission@94baf225fe0a508e581a564467443d0e2379123b # ratchet:gradle/actions/dependency-submission@v4
3737
- name: Build with Gradle
3838
run: ./gradlew clean wonderwalled-${{ matrix.module }}:build wonderwalled-${{ matrix.module }}:shadowJar
39-
- uses: nais/platform-build-push-sign@main # ratchet:exclude
40-
id: build_push_sign
39+
- name: Build and push image and SBOM to OCI registry
40+
uses: nais/docker-build-push@v0
41+
id: docker-build-push
4142
with:
4243
name: wonderwalled-${{ matrix.module }}
4344
context: ./wonderwalled-${{ matrix.module }}
4445
dockerfile: ./wonderwalled-${{ matrix.module }}/Dockerfile
45-
google_service_account: gh-wonderwalled
46-
multi-platform: true
47-
push: true
48-
workload_identity_provider: ${{ secrets.NAIS_IO_WORKLOAD_IDENTITY_PROVIDER }}
46+
team: nais
47+
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} # Provided as Organization Secret
48+
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} # Provided as Organization Variable
4949
- uses: nais/deploy/actions/deploy@v2 # ratchet:exclude
5050
env:
5151
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
@@ -55,7 +55,6 @@ jobs:
5555
- uses: nais/deploy/actions/deploy@v2 # ratchet:exclude
5656
if: matrix.token-generator
5757
env:
58-
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
5958
CLUSTER: dev-gcp
6059
RESOURCE: .nais/${{ matrix.module }}-token-generator.yaml
6160
IMAGE: ${{ steps.build_push_sign.outputs.tag }}

0 commit comments

Comments
 (0)