From 73d01ab4084e32ae889c9485382b86861d8ccca4 Mon Sep 17 00:00:00 2001 From: chgl Date: Tue, 28 Sep 2021 21:02:44 +0200 Subject: [PATCH] bumped dependencies to latest --- Dockerfile | 7 +++---- pom.xml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1739d66..5d3772e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3.6.3-jdk-11-slim as build-hapi +FROM maven:3.8.2-jdk-11-slim as build-hapi WORKDIR /tmp/hapi-fhir-jpaserver-starter COPY pom.xml . @@ -13,9 +13,8 @@ RUN mvn package spring-boot:repackage -Pboot RUN mkdir /app && \ cp /tmp/hapi-fhir-jpaserver-starter/target/ROOT.war /app/main.war -FROM gcr.io/distroless/java-debian10:11 AS release-distroless +FROM gcr.io/distroless/java-debian11:11 AS release-distroless COPY --chown=nonroot:nonroot --from=build-distroless /app /app -EXPOSE 8080 # 65532 is the nonroot user's uid # used here instead of the name to allow Kubernetes to easily detect that the container # is running as a non-root (uid != 0) user. @@ -23,7 +22,7 @@ USER 65532:65532 WORKDIR /app CMD ["/app/main.war"] -FROM tomcat:9.0.38-jdk11-openjdk-slim-buster +FROM tomcat:9.0.53-jdk11-openjdk-slim-bullseye RUN mkdir -p /data/hapi/lucenefiles && chmod 775 /data/hapi/lucenefiles COPY --from=build-hapi /tmp/hapi-fhir-jpaserver-starter/target/*.war /usr/local/tomcat/webapps/ diff --git a/pom.xml b/pom.xml index 80dc78f..94f096c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ ca.uhn.hapi.fhir hapi-fhir - 5.5.0 + 5.5.1 hapi-fhir-jpaserver-starter