Skip to content

Commit

Permalink
Bytter til distroless (#819)
Browse files Browse the repository at this point in the history
### 💰 Hva skal gjøres, og hvorfor?
Gjør som på ba-sak. Bytter til distroless. For å få helt kontroll på
Timezone/TZ for datavarehusendringer som følger.

Bruker printenv i stedet for env for å hente ut miljøvariabler.


Testet preprod og DevLauncherPostgresPreprod
  • Loading branch information
stigebil authored Sep 2, 2024
1 parent 129c85f commit 767510b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
14 changes: 10 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
FROM ghcr.io/navikt/baseimages/temurin:21
FROM busybox:1.36.1-uclibc as busybox

ENV APPD_ENABLED=true
ENV APP_NAME=familie-ks-sak
# Final image
FROM gcr.io/distroless/java21:nonroot
COPY --from=busybox /bin/printenv /bin/printenv
COPY --chown=nonroot:nonroot ./build/libs/familie-ks-sak.jar /app/app.jar
WORKDIR /app

COPY ./build/libs/familie-ks-sak.jar "app.jar"
ENV APP_NAME=familie-ks-sak
ENV TZ="Europe/Oslo"
# TLS Config works around an issue in OpenJDK... See: https://github.com/kubernetes-client/java/issues/854
ENTRYPOINT [ "java", "-Djdk.tls.client.protocols=TLSv1.2", "-jar", "/app/app.jar" ]
2 changes: 1 addition & 1 deletion hentMiljøvariabler.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
kubectl config use-context dev-gcp
PODNAVN=$(kubectl -n teamfamilie get pods --field-selector=status.phase==Running -o name | grep familie-ks-sak | grep -v "frontend" | sed "s/^.\{4\}//" | head -n 1);

PODVARIABLER="$(kubectl -n teamfamilie exec -c familie-ks-sak -it "$PODNAVN" -- env)"
PODVARIABLER="$(kubectl -n teamfamilie exec -c familie-ks-sak -it "$PODNAVN" -- printenv)"
UNLEASH_VARIABLER="$(kubectl -n teamfamilie get secret familie-ks-sak-unleash-api-token -o json | jq '.data | map_values(@base64d)')"

AZURE_APP_CLIENT_ID="$(echo "$PODVARIABLER" | grep "AZURE_APP_CLIENT_ID" | tr -d '\r' )"
Expand Down

0 comments on commit 767510b

Please sign in to comment.