From 5aa9e3a7b41672ac854cc338f131e25e9de6c9c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 12:31:02 +0000 Subject: [PATCH 1/3] Bump ubi8/ubi-minimal from 8.8-860 to 8.8-1072 in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.8-860 to 8.8-1072. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- app/src/main/docker/Dockerfile-basex.jvm | 2 +- app/src/main/docker/Dockerfile-basex.native | 2 +- app/src/main/docker/Dockerfile-postgresql.jvm | 2 +- app/src/main/docker/Dockerfile-postgresql.native | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/docker/Dockerfile-basex.jvm b/app/src/main/docker/Dockerfile-basex.jvm index fd96b2d0..550c2ec2 100644 --- a/app/src/main/docker/Dockerfile-basex.jvm +++ b/app/src/main/docker/Dockerfile-basex.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile-basex.native b/app/src/main/docker/Dockerfile-basex.native index 128860fd..69de2eee 100644 --- a/app/src/main/docker/Dockerfile-basex.native +++ b/app/src/main/docker/Dockerfile-basex.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/app/src/main/docker/Dockerfile-postgresql.jvm b/app/src/main/docker/Dockerfile-postgresql.jvm index 5c3b583f..d132168e 100644 --- a/app/src/main/docker/Dockerfile-postgresql.jvm +++ b/app/src/main/docker/Dockerfile-postgresql.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile-postgresql.native b/app/src/main/docker/Dockerfile-postgresql.native index b58255e4..74b6b851 100644 --- a/app/src/main/docker/Dockerfile-postgresql.native +++ b/app/src/main/docker/Dockerfile-postgresql.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From 01ca6b6b4441f15039f483b562ab06db643c60d7 Mon Sep 17 00:00:00 2001 From: Pascal Wilbrink Date: Wed, 11 Oct 2023 10:09:29 +0200 Subject: [PATCH 2/3] Delete app/src/main/docker/Dockerfile-basex.jvm Signed-off-by: Pascal Wilbrink --- app/src/main/docker/Dockerfile-basex.jvm | 56 ------------------------ 1 file changed, 56 deletions(-) delete mode 100644 app/src/main/docker/Dockerfile-basex.jvm diff --git a/app/src/main/docker/Dockerfile-basex.jvm b/app/src/main/docker/Dockerfile-basex.jvm deleted file mode 100644 index 550c2ec2..00000000 --- a/app/src/main/docker/Dockerfile-basex.jvm +++ /dev/null @@ -1,56 +0,0 @@ -#### -# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode -# -# Before building the container image run: -# -# ./mvnw package -# -# Then, build the image with: -# -# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/app-jvm . -# -# Then run the container using: -# -# docker run -i --rm -p 8080:8080 quarkus/app-jvm -# -# If you want to include the debug port into your docker image -# you will have to expose the debug port (default 5005) like this : EXPOSE 8080 5005 -# -# Then run the container using : -# -# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm -# -### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072 - -ARG JAVA_PACKAGE=java-17-openjdk-headless -ARG RUN_JAVA_VERSION=1.3.8 -ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' -# Install java and the run-java script -# Also set up permissions for user `1001` -RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \ - && microdnf update \ - && microdnf clean all \ - && mkdir /deployments \ - && chown 1001 /deployments \ - && chmod "g+rwX" /deployments \ - && chown 1001:root /deployments \ - && curl https://repo1.maven.org/maven2/io/fabric8/run-java-sh/${RUN_JAVA_VERSION}/run-java-sh-${RUN_JAVA_VERSION}-sh.sh -o /deployments/run-java.sh \ - && chown 1001 /deployments/run-java.sh \ - && chmod 540 /deployments/run-java.sh \ - && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/conf/security/java.security - -# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size. -ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" -ENV JAVA_MAX_MEM_RATIO="70" -# We make four distinct layers so if there are application changes the library layers can be re-used -COPY --chown=1001 target/basex-quarkus-app/lib/ /deployments/lib/ -COPY --chown=1001 target/basex-quarkus-app/*.jar /deployments/ -COPY --chown=1001 target/basex-quarkus-app/app/ /deployments/app/ -COPY --chown=1001 target/basex-quarkus-app/quarkus/ /deployments/quarkus/ - -EXPOSE 8080 -USER 1001 - -ENTRYPOINT [ "/deployments/run-java.sh" ] - From 8592cb7023f519d673f313e5ff9f67bc7d7c00ee Mon Sep 17 00:00:00 2001 From: Pascal Wilbrink Date: Wed, 11 Oct 2023 10:09:40 +0200 Subject: [PATCH 3/3] Delete app/src/main/docker/Dockerfile-basex.native Signed-off-by: Pascal Wilbrink --- app/src/main/docker/Dockerfile-basex.native | 27 --------------------- 1 file changed, 27 deletions(-) delete mode 100644 app/src/main/docker/Dockerfile-basex.native diff --git a/app/src/main/docker/Dockerfile-basex.native b/app/src/main/docker/Dockerfile-basex.native deleted file mode 100644 index 69de2eee..00000000 --- a/app/src/main/docker/Dockerfile-basex.native +++ /dev/null @@ -1,27 +0,0 @@ -#### -# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode -# -# Before building the container image run: -# -# ./mvnw package -Pnative -# -# Then, build the image with: -# -# docker build -f src/main/docker/Dockerfile.native -t quarkus/app . -# -# Then run the container using: -# -# docker run -i --rm -p 8080:8080 quarkus/app -# -### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072 -WORKDIR /work/ -RUN chown 1001 /work \ - && chmod "g+rwX" /work \ - && chown 1001:root /work -COPY --chown=1001:root target/basex-quarkus-app/*-runner /work/application - -EXPOSE 8080 -USER 1001 - -CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]