[CI] Fix Rocky/AwsLinux builds.

real-logic · Aug 23, 2024 · d9a2d69 · d9a2d69
1 parent 119a787
commit d9a2d69
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/cppbuild/awslinux/Dockerfile b/cppbuild/awslinux/Dockerfile
@@ -1,8 +1,7 @@
 ARG VERSION="2023"
 FROM amazonlinux:${VERSION} as builder
 
-RUN yum update && yum install -y https://cdn.azul.com/zulu/bin/zulu-repo-1.0.0-1.noarch.rpm && \
-    yum update && yum install -y \
+RUN yum update && yum install -y \
     gcc \
     g++ \
     make \
@@ -11,12 +10,12 @@ RUN yum update && yum install -y https://cdn.azul.com/zulu/bin/zulu-repo-1.0.0-1
     libbsd-devel \
     libuuid-devel \
     git \
-    zulu-17 \
+    java-17-openjdk-devel \
     doxygen \
     python3
 
-ENV JAVA_HOME=/usr/lib/jvm/zulu-17 \
-    BUILD_JAVA_HOME=/usr/lib/jvm/zulu-17 \
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk \
+    BUILD_JAVA_HOME=/usr/lib/jvm/java-17-openjdk \
     BUILD_JAVA_VERSION=17 \
     GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail"
 

diff --git a/cppbuild/rocky/Dockerfile b/cppbuild/rocky/Dockerfile
@@ -3,8 +3,7 @@ FROM rockylinux:${VERSION} as builder
 
 ARG GCC_VERSION="10"
 
-RUN yum update -y && yum install -y https://cdn.azul.com/zulu/bin/zulu-repo-1.0.0-1.noarch.rpm && \
-    yum update -y && yum install -y \
+RUN yum update -y && yum install -y \
     scl-utils \
     gcc-toolset-${GCC_VERSION}-gcc \
     gcc-toolset-${GCC_VERSION}-gcc-c++ \
@@ -15,10 +14,10 @@ RUN yum update -y && yum install -y https://cdn.azul.com/zulu/bin/zulu-repo-1.0.
     git \
     findutils \
     openssl-devel \
-    zulu-17
+    java-17-openjdk-devel
 
-ENV JAVA_HOME=/usr/lib/jvm/zulu-17 \
-    BUILD_JAVA_HOME=/usr/lib/jvm/zulu-17 \
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk \
+    BUILD_JAVA_HOME=/usr/lib/jvm/java-17-openjdk \
     BUILD_JAVA_VERSION=17 \
     GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail" \
     GCC_VERSION=${GCC_VERSION}