diff --git a/Dockerfile b/Dockerfile index 5fb795c79..7d209b497 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,4 @@ -# sha from https://hub.docker.com/layers/library/eclipse-temurin/21-jre-alpine-3.23/images/sha256-693c22ea458d62395bac47a2da405d0d18c77b205211ceec4846a550a37684b6 -FROM eclipse-temurin@sha256:693c22ea458d62395bac47a2da405d0d18c77b205211ceec4846a550a37684b6 - +FROM eclipse-temurin:21-jdk-alpine # For Amazon Corretto Crypto Provider RUN apk add --no-cache gcompat @@ -23,11 +21,17 @@ COPY ./conf/*.xml /app/conf/ RUN tar xzvf /app/static.tar.gz --no-same-owner --no-same-permissions && rm -f /app/static.tar.gz +# Fix CVE-2025-68973: Update gnupg to patched version +# Fix CVE-2026-1584: Update gnutls to patched version +# Fix CVE-2026-25646: Update libpng to patched version +RUN apk update && apk upgrade gnupg gnutls libpng && rm -rf /var/cache/apk/* + RUN adduser -D uid2-operator && mkdir -p /opt/uid2 && chmod 777 -R /opt/uid2 && mkdir -p /app && chmod 705 -R /app && mkdir -p /app/file-uploads && chmod 777 -R /app/file-uploads && mkdir -p /app/pod_terminating && chmod 777 -R /app/pod_terminating USER uid2-operator CMD java \ -XX:MaxRAMPercentage=95 -XX:-UseCompressedOops -XX:+PrintFlagsFinal -XX:-OmitStackTraceInFastThrow \ + -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints \ -Djava.security.egd=file:/dev/./urandom \ -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.SLF4JLogDelegateFactory \ -Dlogback.configurationFile=/app/conf/logback.xml \ diff --git a/pom.xml b/pom.xml index 2773ab5e1..ff45a03a8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-operator - 5.66.14 + 5.66.17-alpha-314-SNAPSHOT UTF-8