Skip to content

Commit 2339c59

Browse files
committed
add rhel9 docker support
1 parent ac6534a commit 2339c59

File tree

2 files changed

+13
-19
lines changed

2 files changed

+13
-19
lines changed

dist/20.10.24.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -485,10 +485,6 @@ do_install() {
485485
exit 0
486486
;;
487487
centos|fedora|rhel|ol|rocky)
488-
if [ "$(uname -m)" != "s390x" ] && [ "$lsb_dist" = "rhel" ]; then
489-
echo "Packages for RHEL are currently only available for s390x."
490-
exit 1
491-
fi
492488
# set vault.centos.or repo as CentOS8 is now EOL
493489
if [ "$lsb_dist" = "centos" ] && [ "$dist_version" -ge "8" ]; then
494490
$sh_c "find /etc/yum.repos.d -type f -exec sed -i 's/mirrorlist=http:\/\/mirrorlist.centos.org/\#mirrorlist=http:\/\/mirrorlist.centos.org/g' {} \;"
@@ -511,7 +507,7 @@ do_install() {
511507
pkg_suffix="el"
512508
fi
513509
repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE"
514-
if [ "$lsb_dist" = "ol" ] || [ "$lsb_dist" = "rocky" ]; then
510+
if [ "$lsb_dist" = "ol" ] || [ "$lsb_dist" = "rocky" ] || [ "$lsb_dist" = "rhel" ]; then
515511
repo_file_url="$DOWNLOAD_URL/linux/centos/$REPO_FILE"
516512
fi
517513
(

pkg/20.10.24/20.10.24.diff

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- 20.10.24.orig.sh 2023-05-05 16:40:09.913545090 +0000
2-
+++ 20.10.24.sh 2023-05-05 16:40:09.921545089 +0000
1+
--- 20.10.24.orig.sh 2023-05-08 14:45:20.378271328 +0530
2+
+++ 20.10.24.sh 2023-05-08 14:44:46.431897959 +0530
33
@@ -21,28 +21,34 @@
44
# the script was uploaded (Should only be modified by upload job):
55
SCRIPT_COMMIT_SHA="a8a6b338bdfedd7ddefb96fe3e7fe7d4036d945a"
@@ -94,7 +94,7 @@
9494
;;
9595

9696
*)
97-
@@ -453,15 +478,23 @@
97+
@@ -453,14 +478,18 @@
9898
set -x
9999
fi
100100
$sh_c "DEBIAN_FRONTEND=noninteractive apt-get install -y -qq $pkgs >/dev/null"
@@ -105,31 +105,29 @@
105105
exit 0
106106
;;
107107
- centos|fedora|rhel)
108+
- if [ "$(uname -m)" != "s390x" ] && [ "$lsb_dist" = "rhel" ]; then
109+
- echo "Packages for RHEL are currently only available for s390x."
110+
- exit 1
108111
+ centos|fedora|rhel|ol|rocky)
109-
if [ "$(uname -m)" != "s390x" ] && [ "$lsb_dist" = "rhel" ]; then
110-
echo "Packages for RHEL are currently only available for s390x."
111-
exit 1
112-
fi
113112
+ # set vault.centos.or repo as CentOS8 is now EOL
114113
+ if [ "$lsb_dist" = "centos" ] && [ "$dist_version" -ge "8" ]; then
115114
+ $sh_c "find /etc/yum.repos.d -type f -exec sed -i 's/mirrorlist=http:\/\/mirrorlist.centos.org/\#mirrorlist=http:\/\/mirrorlist.centos.org/g' {} \;"
116115
+ $sh_c "find /etc/yum.repos.d -type f -exec sed -i 's/\#baseurl=http:\/\/mirror.centos.org/baseurl=http:\/\/vault.centos.org/g' {} \;"
117116
+ $sh_c "dnf swap centos-linux-repos centos-stream-repos -y"
118-
+ fi
117+
fi
119118
if [ "$lsb_dist" = "fedora" ]; then
120119
pkg_manager="dnf"
121-
config_manager="dnf config-manager"
122-
@@ -478,6 +511,9 @@
120+
@@ -478,6 +507,9 @@
123121
pkg_suffix="el"
124122
fi
125123
repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE"
126-
+ if [ "$lsb_dist" = "ol" ] || [ "$lsb_dist" = "rocky" ]; then
124+
+ if [ "$lsb_dist" = "ol" ] || [ "$lsb_dist" = "rocky" ] || [ "$lsb_dist" = "rhel" ]; then
127125
+ repo_file_url="$DOWNLOAD_URL/linux/centos/$REPO_FILE"
128126
+ fi
129127
(
130128
if ! is_dry_run; then
131129
set -x
132-
@@ -489,6 +525,25 @@
130+
@@ -489,6 +521,25 @@
133131
$sh_c "$config_manager $disable_channel_flag docker-ce-*"
134132
$sh_c "$config_manager $enable_channel_flag docker-ce-$CHANNEL"
135133
fi
@@ -155,7 +153,7 @@
155153
$sh_c "$pkg_manager makecache"
156154
)
157155
pkg_version=""
158-
@@ -548,8 +603,7 @@
156+
@@ -548,8 +599,7 @@
159157
if [ "$dist_version" = "15.3" ]; then
160158
sles_version="SLE_15_SP3"
161159
else
@@ -165,7 +163,7 @@
165163
fi
166164
opensuse_repo="https://download.opensuse.org/repositories/security:SELinux/$sles_version/security:SELinux.repo"
167165
repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE"
168-
@@ -615,10 +669,25 @@
166+
@@ -615,10 +665,25 @@
169167
set -x
170168
fi
171169
$sh_c "zypper -q install -y $pkgs"

0 commit comments

Comments
 (0)