Skip to content

Switch to redhat/ubi8 #554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gschueler merged 2 commits into from
Jul 29, 2024
Merged

Switch to redhat/ubi8 #554

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f3d8b4
Switch to redhat/ubi8
gschueler Jul 29, 2024
4ab9f42
cleanup
gschueler Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions dockers/install/rpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions dockers/install/upgrade-rpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion dockers/install/yum/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion dockers/verify/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM centos:8
FROM redhat/ubi8

VOLUME /data

Expand Down
7 changes: 2 additions & 5 deletions scripts/install-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -70,10 +69,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" "$VERS" "$JDK"
run_all "$RPMTAG-$JDK"
done
}

Expand Down