Skip to content
This repository has been archived by the owner on Nov 5, 2024. It is now read-only.

Commit

Permalink
Merge pull request #704 from navikt/dev/bytter_base_image
Browse files Browse the repository at this point in the history
Dev/bytter base image
  • Loading branch information
maccyber authored Sep 1, 2023
2 parents b5683bb + 57827ea commit 8a399ba
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM ghcr.io/navikt/pus-nais-java-app/pus-nais-java-app:java17
FROM ghcr.io/navikt/baseimages/temurin:17
COPY /target/veilarbregistrering.jar app.jar
3 changes: 2 additions & 1 deletion nais/nais-dev-gcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ spec:
- "NAVident"
tokenx:
enabled: true
idporten:
enabled: true
envFrom:
- configmap: loginservice-idporten
- secret: veilarbregistrering
image: {{image}}
ingresses:
Expand Down
3 changes: 2 additions & 1 deletion nais/nais-prod-gcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ spec:
- "NAVident"
tokenx:
enabled: true
idporten:
enabled: true
envFrom:
- configmap: loginservice-idporten
- secret: veilarbregistrering
image: {{image}}
ingresses:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ class FilterConfig {
}

private fun createAzureAdB2CConfig(): OidcAuthenticatorConfig {
val discoveryUrl = requireProperty("LOGINSERVICE_IDPORTEN_DISCOVERY_URL")
val clientId = requireProperty("LOGINSERVICE_IDPORTEN_AUDIENCE")
val discoveryUrl = requireProperty("IDPORTEN_WELL_KNOWN_URL")
val clientId = requireProperty("IDPORTEN_CLIENT_ID")
return OidcAuthenticatorConfig()
.withDiscoveryUrl(discoveryUrl)
.withClientId(clientId)
Expand Down

0 comments on commit 8a399ba

Please sign in to comment.