From bb1f521c0634dbdf123c2c0a6f25c3dd3ef7c82f Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Sat, 16 Nov 2024 15:45:18 +0100 Subject: [PATCH 1/2] Handle null response as it seems it can happen... --- src/main/java/io/quarkus/status/github/GitHubService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/io/quarkus/status/github/GitHubService.java b/src/main/java/io/quarkus/status/github/GitHubService.java index 6702007..7ead7de 100644 --- a/src/main/java/io/quarkus/status/github/GitHubService.java +++ b/src/main/java/io/quarkus/status/github/GitHubService.java @@ -186,6 +186,10 @@ private Issue extractIssue(JsonObject issueJson) { } private void handleErrors(Response response) throws IOException { + if(response == null) { + throw new RuntimeException("No response received. This is very odd..."); + } + List errors = response.getErrors(); if (errors != null) { // Checking if there are any errors different from NOT_FOUND From d1af9b2412e4ba4c18f14fe69aa49743e6d2d7aa Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Sat, 16 Nov 2024 15:52:15 +0100 Subject: [PATCH 2/2] Modernize status.quarkus.io --- .github/workflows/ci-build.yml | 2 +- pom.xml | 18 +++++----- src/main/docker/Dockerfile.jvm | 59 ++++++------------------------- src/main/docker/Dockerfile.native | 2 +- 4 files changed, 22 insertions(+), 59 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index bdbb7fb..6aaf0c6 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ '11' ] + java: [ '21' ] steps: - uses: actions/checkout@v3 - name: Install JDK ${{ matrix.java }} diff --git a/pom.xml b/pom.xml index 94873d4..6ca5150 100644 --- a/pom.xml +++ b/pom.xml @@ -8,16 +8,16 @@ quarkus-status 1.0-SNAPSHOT - 3.11.0 + 3.13.0 true - 11 - 11 + 21 + 21 UTF-8 UTF-8 - 3.2.5.Final + 3.16.3 quarkus-bom io.quarkus - 3.1.2 + 3.5.2 @@ -31,18 +31,18 @@ org.assertj assertj-core - 3.24.2 + 3.26.3 io.quarkus - quarkus-resteasy + quarkus-rest io.quarkus - quarkus-resteasy-qute + quarkus-rest-qute io.quarkus @@ -71,7 +71,7 @@ io.quarkiverse.prettytime quarkus-prettytime - 2.0.1 + 2.0.10 io.quarkus diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm index af4efbe..3312190 100644 --- a/src/main/docker/Dockerfile.jvm +++ b/src/main/docker/Dockerfile.jvm @@ -1,54 +1,17 @@ -#### -# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode -# -# Before building the docker image run: -# -# mvn package -# -# Then, build the image with: -# -# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/quarkus-backports-jvm . -# -# Then run the container using: -# -# docker run -i --rm -p 8080:8080 quarkus/quarkus-backports-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 5050 -# -# Then run the container using : -# -# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/quarkus-backports-jvm -# -### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1 +FROM registry.access.redhat.com/ubi8/openjdk-17:1.20 -ARG JAVA_PACKAGE=java-11-openjdk-headless -ARG RUN_JAVA_VERSION=1.3.8 +ENV LANGUAGE='en_US:en' -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/lib/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" - -COPY target/lib/* /deployments/lib/ -COPY target/*-runner.jar /deployments/app.jar +# We make four distinct layers so if there are application changes the library layers can be re-used +COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/ +COPY --chown=185 target/quarkus-app/*.jar /deployments/ +COPY --chown=185 target/quarkus-app/app/ /deployments/app/ +COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/ EXPOSE 8080 -USER 1001 +USER 185 +ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" +ENV JAVA_APP_JAR="/deployments/quarkus-run.jar" -ENTRYPOINT [ "/deployments/run-java.sh" ] \ No newline at end of file +ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ] diff --git a/src/main/docker/Dockerfile.native b/src/main/docker/Dockerfile.native index a0818de..2476ccd 100644 --- a/src/main/docker/Dockerfile.native +++ b/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/quarkus-backports # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \