Skip to content

Commit

Permalink
Oppgrader til java 21 og avhengigheter
Browse files Browse the repository at this point in the history
  • Loading branch information
ugur93 committed Nov 13, 2023
1 parent 57c4f68 commit f5c9103
Show file tree
Hide file tree
Showing 67 changed files with 2,657 additions and 2,747 deletions.
7 changes: 7 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[*.{kt,kts}]
ktlint_code_style = intellij_idea
ktlint_standard_property-naming = disabled
max_line_length = 150
tab_width = 4
ktlint_standard_max-line-length = disabled
ktlint_standard_class-naming = disabled
24 changes: 19 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
FROM ghcr.io/navikt/baseimages/temurin:17
FROM busybox:1.36.1-uclibc as busybox

FROM gcr.io/distroless/java21-debian12:nonroot
LABEL maintainer="Team Bidrag" \
email="nav.ikt.prosjekt.og.forvaltning.[email protected]"
email="[email protected]"

COPY init-scripts /init-scripts
ADD ./target/bidrag-dokument-arkiv*.jar app.jar
COPY --from=busybox /bin/sh /bin/sh
COPY --from=busybox /bin/printenv /bin/printenv

WORKDIR /app

COPY ./target/app.jar app.jar

ENV SPRING_PROFILES_ACTIVE=nais
EXPOSE 8080
ARG JDK_JAVA_OPTIONS
ENV TZ="Europe/Oslo"
ENV SPRING_PROFILES_ACTIVE=nais
ENV JDK_JAVA_OPTIONS="-Dhttp.proxyHost=webproxy.nais \
-Dhttps.proxyHost=webproxy.nais \
-Dhttp.proxyPort=8088 \
-Dhttps.proxyPort=8088 \
-Dhttp.nonProxyHosts=localhost|127.0.0.1|10.254.0.1|*.local|*.adeo.no|*.nav.no|*.aetat.no|*.devillo.no|*.oera.no|*.nais.io|*.aivencloud.com|*.intern.dev.nav.no"
CMD ["app.jar"]
Loading

0 comments on commit f5c9103

Please sign in to comment.