Merge pull request #554 from rundeck/fix/use-redhat-ubi

Switch to redhat/ubi8
rundeck · Jul 29, 2024 · 581dfbb · 581dfbb
2 parents d2cfc9e + 4ab9f42
commit 581dfbb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/dockers/install/rpm/Dockerfile b/dockers/install/rpm/Dockerfile
@@ -1,5 +1,4 @@
-ARG VERS=7
-FROM centos:$VERS
+FROM redhat/ubi8
 ARG JDK=java-1.8.0-openjdk
 RUN yum -y update
 RUN yum -y install ${JDK} ${JDK}-devel which

diff --git a/dockers/install/upgrade-rpm/Dockerfile b/dockers/install/upgrade-rpm/Dockerfile
@@ -1,5 +1,4 @@
-ARG VERS
-FROM centos:${VERS:-7}
+FROM redhat/ubi8
 
 RUN yum -y update
 RUN yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel which

diff --git a/dockers/install/yum/Dockerfile b/dockers/install/yum/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:8
+FROM redhat/ubi8
 
 RUN yum -y update
 RUN yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel which

diff --git a/dockers/verify/Dockerfile b/dockers/verify/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:8
+FROM redhat/ubi8
 
 VOLUME /data
 

diff --git a/scripts/install-test.sh b/scripts/install-test.sh
@@ -5,7 +5,6 @@ set -euo pipefail
 DEBTAG=rdcli-deb
 RPMTAG=rdcli-rpm
 UBUNTUVERS="18.04 20.04 22.04"
-CENTOSVERS="7"
 RPMJDK="java-1.8.0-openjdk java-11-openjdk"
 DEBJDK="openjdk-8-jdk openjdk-11-jdk"
 
@@ -46,13 +45,12 @@ build_deb_version() {
 
 build_rpm_version() {
   local TAG=$1
-  local VERS=$2
-  local JDK=$3
+  local JDK=$2
   local rpmfile
   rpmfile=$(ls rd-cli-tool/build/distributions/rundeck-cli-*.noarch.rpm)
 
   cp "$rpmfile" dockers/install/rpm/rundeck-cli-noarch.rpm
-  docker build --build-arg VERS="${VERS}" --build-arg JDK="${JDK}" dockers/install/rpm -t "${TAG}"
+  docker build --build-arg JDK="${JDK}" dockers/install/rpm -t "${TAG}"
 }
 
 run_all() {
@@ -70,10 +68,8 @@ main() {
     done
   done
   for JDK in $RPMJDK; do
-    for VERS in $CENTOSVERS; do
-      build_rpm_version "$RPMTAG$VERS-$JDK" "$VERS" "$JDK"
-      run_all "$RPMTAG$VERS-$JDK"
-    done
+    build_rpm_version "$RPMTAG-$JDK" "$JDK"
+    run_all "$RPMTAG-$JDK"
   done
 }