From 4ae03c7cb22c5da91de81a0baaab2e9a0d5c927e Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 27 Mar 2026 15:40:03 -0400 Subject: [PATCH 1/2] :sparkles: Upgrade to UBI 10 Signed-off-by: Dylan --- Dockerfile | 8 ++++---- Dockerfile.test | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5313a47..7fff427 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/ubi AS jdtls-download +FROM registry.access.redhat.com/ubi10/ubi AS jdtls-download WORKDIR /jdtls RUN curl -s -o jdtls.tar.gz https://download.eclipse.org/jdtls/milestones/1.51.0/jdt-language-server-1.51.0-202510022025.tar.gz &&\ tar -xvf jdtls.tar.gz --no-same-owner &&\ @@ -7,14 +7,14 @@ RUN curl -s -o jdtls.tar.gz https://download.eclipse.org/jdtls/milestones/1.51.0 COPY jdtls-bin-override/jdtls.py /jdtls/bin/jdtls.py -FROM registry.access.redhat.com/ubi9/ubi AS fernflower +FROM registry.access.redhat.com/ubi10/ubi AS fernflower RUN dnf install -y maven-openjdk17 wget --setopt=install_weak_deps=False && dnf clean all && rm -rf /var/cache/dnf RUN wget --quiet https://github.com/JetBrains/intellij-community/archive/refs/tags/idea/231.9011.34.tar.gz -O intellij-community.tar && tar xf intellij-community.tar intellij-community-idea-231.9011.34/plugins/java-decompiler/engine && rm -rf intellij-community.tar WORKDIR /intellij-community-idea-231.9011.34/plugins/java-decompiler/engine RUN ./gradlew build -x test && rm -rf /root/.gradle RUN mkdir /output && cp ./build/libs/fernflower.jar /output -FROM registry.access.redhat.com/ubi9/ubi AS addon-build +FROM registry.access.redhat.com/ubi10/ubi AS addon-build RUN dnf install -y java-21-openjdk-devel wget zip --nodocs --setopt=install_weak_deps=0 && dnf clean all && rm -rf /var/cache/dnf RUN curl -fsSL -o /tmp/apache-maven.tar.gz https://dlcdn.apache.org/maven/maven-3/3.9.14/binaries/apache-maven-3.9.14-bin.tar.gz && \ tar -xzf /tmp/apache-maven.tar.gz -C /usr/local/ && \ @@ -38,7 +38,7 @@ RUN set -e; \ unzip maven-index-data.zip && \ rm maven-index-data.zip -FROM registry.access.redhat.com/ubi9/ubi-minimal +FROM registry.access.redhat.com/ubi10/ubi-minimal # Java 1.8 is required for backwards compatibility with older versions of Gradle RUN microdnf install -y python39 java-1.8.0-openjdk-devel java-21-openjdk-devel tar gzip zip --nodocs --setopt=install_weak_deps=0 && microdnf clean all && rm -rf /var/cache/dnf ENV JAVA_HOME /usr/lib/jvm/java-21-openjdk diff --git a/Dockerfile.test b/Dockerfile.test index 4e5ccaf..8f731d3 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/ubi AS jdtls-download +FROM registry.access.redhat.com/ubi10/ubi AS jdtls-download WORKDIR /jdtls RUN curl -s -o jdtls.tar.gz https://download.eclipse.org/jdtls/milestones/1.51.0/jdt-language-server-1.51.0-202510022025.tar.gz &&\ tar -xvf jdtls.tar.gz --no-same-owner --no-same-permissions &&\ @@ -7,10 +7,10 @@ RUN curl -s -o jdtls.tar.gz https://download.eclipse.org/jdtls/milestones/1.51.0 COPY jdtls-bin-override/jdtls.py /jdtls/bin/jdtls.py -FROM registry.access.redhat.com/ubi9/ubi AS maven-index +FROM registry.access.redhat.com/ubi10/ubi AS maven-index COPY hack/maven.default.index /maven.default.index -FROM registry.access.redhat.com/ubi9/ubi AS fernflower +FROM registry.access.redhat.com/ubi10/ubi AS fernflower RUN dnf install -y maven-openjdk17 wget --setopt=install_weak_deps=False && dnf clean all && rm -rf /var/cache/dnf RUN wget --quiet https://github.com/JetBrains/intellij-community/archive/refs/tags/idea/231.9011.34.tar.gz -O intellij-community.tar && tar xf intellij-community.tar intellij-community-idea-231.9011.34/plugins/java-decompiler/engine && rm -rf intellij-community.tar WORKDIR /intellij-community-idea-231.9011.34/plugins/java-decompiler/engine @@ -18,13 +18,13 @@ RUN export JAVA_HOME=/usr/lib/jvm/java-17-openjdk RUN ./gradlew build -x test && rm -rf /root/.gradle RUN mkdir /output && cp ./build/libs/fernflower.jar /output -FROM registry.access.redhat.com/ubi9/ubi-minimal AS index-download +FROM registry.access.redhat.com/ubi10/ubi-minimal AS index-download RUN microdnf install -y wget zip && microdnf clean all && rm -rf /var/cache/dnf WORKDIR /maven-index-data #TODO: get latest release when we get to update them periodically RUN wget --quiet https://github.com/konveyor/maven-search-index/releases/download/v0.0.1/maven-index-data-v0.0.1.zip -O maven-index-data.zip && unzip maven-index-data.zip && rm maven-index-data.zip -FROM registry.access.redhat.com/ubi9/ubi-minimal +FROM registry.access.redhat.com/ubi10/ubi-minimal # Java 1.8 is required for backwards compatibility with older versions of Gradle RUN microdnf install -y python39 java-1.8.0-openjdk-devel java-21-openjdk-devel tar gzip zip --nodocs --setopt=install_weak_deps=0 && microdnf clean all && rm -rf /var/cache/dnf ENV JAVA_HOME /usr/lib/jvm/java-21-openjdk From 8a5b0e9ca98291381fd4430bdf2cb689764e5a36 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 27 Mar 2026 15:58:54 -0400 Subject: [PATCH 2/2] Bump maven Signed-off-by: Dylan --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7fff427..b84f6d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN curl -s -o jdtls.tar.gz https://download.eclipse.org/jdtls/milestones/1.51.0 COPY jdtls-bin-override/jdtls.py /jdtls/bin/jdtls.py FROM registry.access.redhat.com/ubi10/ubi AS fernflower -RUN dnf install -y maven-openjdk17 wget --setopt=install_weak_deps=False && dnf clean all && rm -rf /var/cache/dnf +RUN dnf install -y maven-openjdk21 wget --setopt=install_weak_deps=False && dnf clean all && rm -rf /var/cache/dnf RUN wget --quiet https://github.com/JetBrains/intellij-community/archive/refs/tags/idea/231.9011.34.tar.gz -O intellij-community.tar && tar xf intellij-community.tar intellij-community-idea-231.9011.34/plugins/java-decompiler/engine && rm -rf intellij-community.tar WORKDIR /intellij-community-idea-231.9011.34/plugins/java-decompiler/engine RUN ./gradlew build -x test && rm -rf /root/.gradle