Merge pull request #221 from jglick/centos

Switch from CentOS to UBI
jenkinsci · Aug 5, 2024 · 8fb5c57 · 8fb5c57
2 parents 797b2e6 + 278e9a1
commit 8fb5c57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/test/java/org/jenkinsci/plugins/durabletask/CentOSFixture.java b/src/test/java/org/jenkinsci/plugins/durabletask/CentOSFixture.java
@@ -28,6 +28,6 @@
 import org.jenkinsci.test.acceptance.docker.DockerFixture;
 import org.jenkinsci.test.acceptance.docker.fixtures.JavaContainer;
 
-/** Analogue of {@link JavaContainer} but using CentOS rather than Ubuntu. */
+/** Analogue of {@link JavaContainer} but using UBI (formerly CentOS) rather than Ubuntu. */
 @DockerFixture(id = "centos", ports = 22)
 public class CentOSFixture extends DockerContainer {}
diff --git a/src/test/resources/org/jenkinsci/plugins/durabletask/CentOSFixture/Dockerfile b/src/test/resources/org/jenkinsci/plugins/durabletask/CentOSFixture/Dockerfile
@@ -1,7 +1,8 @@
-FROM centos:7.9.2009
+FROM registry.access.redhat.com/ubi9/ubi
 RUN yum -y install \
         openssh-server \
-        java-11-openjdk-headless \
+        java-21-openjdk-headless \
+        procps-ng \
     && yum clean all
 RUN ssh-keygen -A
 RUN useradd test -d /home/test && \