Skip to content

Commit

Permalink
Prøv å bygge med ny reusable workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
ahusby committed Sep 26, 2024
1 parent d8d6d31 commit 811a598
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 86 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Build and deploy
on: [ push, workflow_dispatch ]

jobs:
call-build-and-deploy:
uses: navikt/toi-github-actions-workflows/.github/workflows/build-and-deploy.yaml@main
with:
java-version: '21'
deploy-to-dev-if-branch-name-is: 'reusable-workflow'
permissions:
contents: read
id-token: write
security-events: write
secrets: inherit
80 changes: 0 additions & 80 deletions .github/workflows/deploy.yml

This file was deleted.

13 changes: 13 additions & 0 deletions .github/workflows/security-scan.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Trivy security scan
on:
schedule:
- cron: '40 5 * * 1'

jobs:
call-trivy-security-scan:
uses: navikt/toi-github-actions-workflows/.github/workflows/trivy-security-scan.yaml@main
permissions:
id-token: write
security-events: write
secrets: inherit

8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
FROM ghcr.io/navikt/baseimages/temurin:21
COPY ./nais/init.sh /init-scripts/init.sh
COPY ./build/libs/rekrutteringsbistand-statistikk-api-all.jar app.jar

EXPOSE 8111
FROM gcr.io/distroless/java21-debian12:nonroot
ADD build/distributions/rekrutteringsbistand-statistikk-api.tar /
ENTRYPOINT ["java", "-cp", "/rekrutteringsbistand-statistikk-api/lib/*", "no.nav.statistikkapi.ApplicationKt"]
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ val avroVersion = "1.11.1"
plugins {
application
kotlin("jvm") version embeddedKotlinVersion // Kotlinversjon styres av gradlew, se https://blog.nishtahir.com/how-to-properly-update-the-gradle-wrapper/
id("com.github.johnrengelman.shadow") version "7.1.2"
id("com.github.ben-manes.versions") version "0.43.0"
id("com.github.davidmc24.gradle.plugin.avro") version "1.5.0"
id("info.solidsoft.pitest") version "1.9.0"
Expand Down

0 comments on commit 811a598

Please sign in to comment.