Skip to content

Commit abd7f35

Browse files
Bruker felles docker image (#800)
* Bruker felles docker image * Fjerner flagg som er satt i base image * Gir dependabot tilgang til ghcr --------- Co-authored-by: Tore Langedal Endestad <[email protected]>
1 parent 3463333 commit abd7f35

File tree

2 files changed

+25
-9
lines changed

2 files changed

+25
-9
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ registries:
3030
url: https://maven.pkg.github.com/navikt/fp-tidsserie
3131
username: x-access-token
3232
password: ${{secrets.READER_TOKEN}}
33+
ghcr:
34+
type: docker-registry
35+
url: ghcr.io
36+
username: x-access-token
37+
password: ${{secrets.READER_TOKEN}}
3338
updates:
3439
- package-ecosystem: maven
3540
directory: "/"
@@ -68,3 +73,5 @@ updates:
6873
directory: "/"
6974
schedule:
7075
interval: daily
76+
registries:
77+
- ghcr

Dockerfile

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
11
# syntax=docker/dockerfile:1.7.0-labs
2-
FROM ghcr.io/navikt/sif-baseimages/java-25:2025.11.04.1325Z
32

3+
FROM ghcr.io/navikt/k9-felles/felles-java-25:9.1.1 AS duplikatfjerner
4+
5+
COPY --link --exclude=no.nav.ung.sak* web/target/lib/ /build/lib/
6+
USER root
7+
RUN ["java", "scripts/RyddBiblioteker", "DUPLIKAT", "/app/lib", "/build/lib"]
8+
9+
10+
11+
FROM ghcr.io/navikt/k9-felles/felles-java-25:9.1.1
412
LABEL org.opencontainers.image.source=https://github.com/navikt/ung-sak
513

6-
ENV JAVA_OPTS="-XX:+UseParallelGC -XX:MaxRAMPercentage=75.0 -XX:ActiveProcessorCount=4 -Djdk.virtualThreadScheduler.parallelism=8 -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Europe/Oslo "
14+
ENV JAVA_OPTS="-Djdk.virtualThreadScheduler.parallelism=8 "
715

8-
# Config
9-
COPY web/target/classes/logback.xml /app/conf/
16+
COPY --link --from=duplikatfjerner /build/lib/ /app/lib/
17+
USER root
18+
RUN ["java", "scripts/RyddBiblioteker", "UBRUKT", "/app/lib"]
19+
USER apprunner
1020

11-
##eksterne avhengigheter (har de i eget lag for bedre bruk av docker build cache)
12-
COPY --link --exclude=no.nav.ung.sak* web/target/lib/ /app/lib/
21+
COPY --link web/target/classes/logback.xml /app/conf/
1322

1423
#fonter, templates
1524
COPY formidling/target/pdfgen /app/pdfgen
1625

17-
# Application Container (Jetty)
18-
COPY web/target/lib/no.nav.ung.sak*.jar /app/lib/
19-
COPY web/target/app.jar /app/
26+
##kopier prosjektets moduler
27+
COPY --link web/target/lib/no.nav.ung.sak* /app/lib/
28+
COPY --link web/target/app.jar /app/
2029

2130
EXPOSE 8901

0 commit comments

Comments
 (0)