Skip to content

Commit caaa3d6

Browse files
author
github-actions
committed
added docker v28.0.0,v28.0.1,v28.0.2,v28.0.3,v28.0.4
1 parent 80a6c53 commit caaa3d6

File tree

16 files changed

+4836
-0
lines changed

16 files changed

+4836
-0
lines changed

‎dist/28.0.0.sh‎

Lines changed: 805 additions & 0 deletions
Large diffs are not rendered by default.

‎dist/28.0.1.sh‎

Lines changed: 805 additions & 0 deletions
Large diffs are not rendered by default.

‎dist/28.0.2.sh‎

Lines changed: 805 additions & 0 deletions
Large diffs are not rendered by default.

‎dist/28.0.3.sh‎

Lines changed: 805 additions & 0 deletions
Large diffs are not rendered by default.

‎dist/28.0.4.sh‎

Lines changed: 805 additions & 0 deletions
Large diffs are not rendered by default.

‎dist/28.0.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
28.0.4.sh

‎pkg/28.0.0/28.0.0.diff‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
--- 28.0.0.orig.sh 2025-04-14 04:38:11.951400609 +0000
2+
+++ 28.0.0.sh 2025-04-14 04:38:11.991400776 +0000
3+
@@ -82,26 +82,34 @@
4+
# the script was uploaded (Should only be modified by upload job):
5+
SCRIPT_COMMIT_SHA="4c94a56999e10efcf48c5b8e3f6afea464f9108e"
6+
7+
-# strip "v" prefix if present
8+
-VERSION="${VERSION#v}"
9+
+CHANNEL="stable"
10+
+DOWNLOAD_URL="https://download.docker.com"
11+
+REPO_FILE="docker-ce.repo"
12+
+VERSION="28.0.0"
13+
+DIND_TEST_WAIT=${DIND_TEST_WAIT:-3s} # Wait time until docker start at dind test env
14+
+
15+
+# Issue https://github.com/rancher/rancher/issues/29246
16+
+adjust_repo_releasever() {
17+
+DOWNLOAD_URL="https://download.docker.com"
18+
+case $1 in
19+
+8*)
20+
+releasever=8
21+
+;;
22+
+9*)
23+
+releasever=9
24+
+;;
25+
+*)
26+
+# fedora, or unsupported
27+
+return
28+
+;;
29+
+esac
30+
31+
-# The channel to install from:
32+
-# * stable
33+
-# * test
34+
-DEFAULT_CHANNEL_VALUE="stable"
35+
-if [ -z "$CHANNEL" ]; then
36+
-CHANNEL=$DEFAULT_CHANNEL_VALUE
37+
-fi
38+
-
39+
-DEFAULT_DOWNLOAD_URL="https://download.docker.com"
40+
-if [ -z "$DOWNLOAD_URL" ]; then
41+
-DOWNLOAD_URL=$DEFAULT_DOWNLOAD_URL
42+
-fi
43+
-
44+
-DEFAULT_REPO_FILE="docker-ce.repo"
45+
-if [ -z "$REPO_FILE" ]; then
46+
-REPO_FILE="$DEFAULT_REPO_FILE"
47+
-fi
48+
+for channel in "stable" "test" "nightly"; do
49+
+$sh_c "$config_manager --setopt=docker-ce-${channel}.baseurl=${DOWNLOAD_URL}/linux/rhel/${releasever}/\\\$basearch/${channel} --save";
50+
+$sh_c "$config_manager --setopt=docker-ce-${channel}-debuginfo.baseurl=${DOWNLOAD_URL}/linux/rhel/${releasever}/debug-\\\$basearch/${channel} --save";
51+
+$sh_c "$config_manager --setopt=docker-ce-${channel}-source.baseurl=${DOWNLOAD_URL}/linux/rhel/${releasever}/source/${channel} --save";
52+
+done
53+
+}
54+
55+
mirror=''
56+
DRY_RUN=${DRY_RUN:-}
57+
@@ -153,6 +161,19 @@
58+
;;
59+
esac
60+
61+
+start_docker() {
62+
+if [ ! -z $DIND_TEST ]; then
63+
+# Starting dockerd manually due to dind env is not using systemd
64+
+dockerd &
65+
+sleep $DIND_TEST_WAIT
66+
+elif [ -d '/run/systemd/system' ] ; then
67+
+$sh_c 'systemctl start docker'
68+
+else
69+
+$sh_c 'service docker start'
70+
+fi
71+
+}
72+
+
73+
+
74+
command_exists() {
75+
command -v "$@" > /dev/null 2>&1
76+
}
77+
@@ -446,10 +467,17 @@
78+
esac
79+
;;
80+
81+
-centos|rhel)
82+
+centos|rhel|sles|rocky)
83+
if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then
84+
dist_version="$(. /etc/os-release && echo "$VERSION_ID")"
85+
fi
86+
+
87+
+;;
88+
+
89+
+oracleserver|ol)
90+
+lsb_dist="ol"
91+
+# need to switch lsb_dist to match yum repo URL
92+
+dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')"
93+
;;
94+
95+
*)
96+
@@ -549,12 +577,16 @@
97+
set -x
98+
fi
99+
$sh_c "DEBIAN_FRONTEND=noninteractive apt-get -y -qq install $pkgs >/dev/null"
100+
+start_docker
101+
)
102+
echo_docker_as_nonroot
103+
exit 0
104+
;;
105+
-centos|fedora|rhel)
106+
+centos|fedora|rhel|ol|rocky)
107+
repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE"
108+
+if [ "$lsb_dist" = "ol" ] || [ "$lsb_dist" = "rocky" ] || [ "$lsb_dist" = "rhel" ]; then
109+
+repo_file_url="$DOWNLOAD_URL/linux/rhel/$REPO_FILE"
110+
+fi
111+
(
112+
if ! is_dry_run; then
113+
set -x
114+
@@ -656,6 +688,11 @@
115+
echo "Packages for SLES are currently only available for s390x"
116+
exit 1
117+
fi
118+
+if [ "$dist_version" = "15.3" ]; then
119+
+sles_version="SLE_15_SP3"
120+
+else
121+
+sles_version="SLE_15_SP2"
122+
+fi
123+
repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE"
124+
pre_reqs="ca-certificates curl libseccomp2 awk"
125+
(
126+
@@ -725,10 +762,25 @@
127+
set -x
128+
fi
129+
$sh_c "zypper -q install -y $pkgs"
130+
+if ! command_exists iptables; then
131+
+ $sh_c "$pkg_manager install -y -q iptables"
132+
+fi
133+
+ start_docker
134+
)
135+
echo_docker_as_nonroot
136+
exit 0
137+
;;
138+
+ rancheros)
139+
+ (
140+
+ set -x
141+
+ $sh_c "sleep 3;ros engine list --update"
142+
+ engine_version="$(sudo ros engine list | awk '{print $2}' | grep ${docker_version} | tail -n 1)"
143+
+ if [ "$engine_version" != "" ]; then
144+
+ $sh_c "ros engine switch -f $engine_version"
145+
+ fi
146+
+ )
147+
+ exit 0
148+
+ ;;
149+
*)
150+
if [ -z "$lsb_dist" ]; then
151+
if is_darwin; then

‎pkg/28.0.0/config.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
3+
DOCKER_GIT_COMMIT="4c94a56999e10efcf48c5b8e3f6afea464f9108e"
4+
5+
TEST_OS_IMAGE_NAME=(oraclelinux ubuntu rockylinux redhat/ubi9 quay.io/centos/centos redhat/ubi8)
6+
TEST_OS_IMAGE_TAG[0]="8 9"
7+
TEST_OS_IMAGE_TAG[1]="22.04 24.04"
8+
TEST_OS_IMAGE_TAG[2]="8 9"
9+
TEST_OS_IMAGE_TAG[3]="9.4"
10+
TEST_OS_IMAGE_TAG[4]="stream9"
11+
TEST_OS_IMAGE_TAG[5]="8.9"

‎pkg/28.0.1/28.0.1.diff‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
--- 28.0.1.orig.sh 2025-04-14 04:38:12.200401653 +0000
2+
+++ 28.0.1.sh 2025-04-14 04:38:12.204401670 +0000
3+
@@ -82,26 +82,34 @@
4+
# the script was uploaded (Should only be modified by upload job):
5+
SCRIPT_COMMIT_SHA="4c94a56999e10efcf48c5b8e3f6afea464f9108e"
6+
7+
-# strip "v" prefix if present
8+
-VERSION="${VERSION#v}"
9+
+CHANNEL="stable"
10+
+DOWNLOAD_URL="https://download.docker.com"
11+
+REPO_FILE="docker-ce.repo"
12+
+VERSION="28.0.1"
13+
+DIND_TEST_WAIT=${DIND_TEST_WAIT:-3s} # Wait time until docker start at dind test env
14+
+
15+
+# Issue https://github.com/rancher/rancher/issues/29246
16+
+adjust_repo_releasever() {
17+
+DOWNLOAD_URL="https://download.docker.com"
18+
+case $1 in
19+
+8*)
20+
+releasever=8
21+
+;;
22+
+9*)
23+
+releasever=9
24+
+;;
25+
+*)
26+
+# fedora, or unsupported
27+
+return
28+
+;;
29+
+esac
30+
31+
-# The channel to install from:
32+
-# * stable
33+
-# * test
34+
-DEFAULT_CHANNEL_VALUE="stable"
35+
-if [ -z "$CHANNEL" ]; then
36+
-CHANNEL=$DEFAULT_CHANNEL_VALUE
37+
-fi
38+
-
39+
-DEFAULT_DOWNLOAD_URL="https://download.docker.com"
40+
-if [ -z "$DOWNLOAD_URL" ]; then
41+
-DOWNLOAD_URL=$DEFAULT_DOWNLOAD_URL
42+
-fi
43+
-
44+
-DEFAULT_REPO_FILE="docker-ce.repo"
45+
-if [ -z "$REPO_FILE" ]; then
46+
-REPO_FILE="$DEFAULT_REPO_FILE"
47+
-fi
48+
+for channel in "stable" "test" "nightly"; do
49+
+$sh_c "$config_manager --setopt=docker-ce-${channel}.baseurl=${DOWNLOAD_URL}/linux/rhel/${releasever}/\\\$basearch/${channel} --save";
50+
+$sh_c "$config_manager --setopt=docker-ce-${channel}-debuginfo.baseurl=${DOWNLOAD_URL}/linux/rhel/${releasever}/debug-\\\$basearch/${channel} --save";
51+
+$sh_c "$config_manager --setopt=docker-ce-${channel}-source.baseurl=${DOWNLOAD_URL}/linux/rhel/${releasever}/source/${channel} --save";
52+
+done
53+
+}
54+
55+
mirror=''
56+
DRY_RUN=${DRY_RUN:-}
57+
@@ -153,6 +161,19 @@
58+
;;
59+
esac
60+
61+
+start_docker() {
62+
+if [ ! -z $DIND_TEST ]; then
63+
+# Starting dockerd manually due to dind env is not using systemd
64+
+dockerd &
65+
+sleep $DIND_TEST_WAIT
66+
+elif [ -d '/run/systemd/system' ] ; then
67+
+$sh_c 'systemctl start docker'
68+
+else
69+
+$sh_c 'service docker start'
70+
+fi
71+
+}
72+
+
73+
+
74+
command_exists() {
75+
command -v "$@" > /dev/null 2>&1
76+
}
77+
@@ -446,10 +467,17 @@
78+
esac
79+
;;
80+
81+
-centos|rhel)
82+
+centos|rhel|sles|rocky)
83+
if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then
84+
dist_version="$(. /etc/os-release && echo "$VERSION_ID")"
85+
fi
86+
+
87+
+;;
88+
+
89+
+oracleserver|ol)
90+
+lsb_dist="ol"
91+
+# need to switch lsb_dist to match yum repo URL
92+
+dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')"
93+
;;
94+
95+
*)
96+
@@ -549,12 +577,16 @@
97+
set -x
98+
fi
99+
$sh_c "DEBIAN_FRONTEND=noninteractive apt-get -y -qq install $pkgs >/dev/null"
100+
+start_docker
101+
)
102+
echo_docker_as_nonroot
103+
exit 0
104+
;;
105+
-centos|fedora|rhel)
106+
+centos|fedora|rhel|ol|rocky)
107+
repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE"
108+
+if [ "$lsb_dist" = "ol" ] || [ "$lsb_dist" = "rocky" ] || [ "$lsb_dist" = "rhel" ]; then
109+
+repo_file_url="$DOWNLOAD_URL/linux/rhel/$REPO_FILE"
110+
+fi
111+
(
112+
if ! is_dry_run; then
113+
set -x
114+
@@ -656,6 +688,11 @@
115+
echo "Packages for SLES are currently only available for s390x"
116+
exit 1
117+
fi
118+
+if [ "$dist_version" = "15.3" ]; then
119+
+sles_version="SLE_15_SP3"
120+
+else
121+
+sles_version="SLE_15_SP2"
122+
+fi
123+
repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE"
124+
pre_reqs="ca-certificates curl libseccomp2 awk"
125+
(
126+
@@ -725,10 +762,25 @@
127+
set -x
128+
fi
129+
$sh_c "zypper -q install -y $pkgs"
130+
+if ! command_exists iptables; then
131+
+ $sh_c "$pkg_manager install -y -q iptables"
132+
+fi
133+
+ start_docker
134+
)
135+
echo_docker_as_nonroot
136+
exit 0
137+
;;
138+
+ rancheros)
139+
+ (
140+
+ set -x
141+
+ $sh_c "sleep 3;ros engine list --update"
142+
+ engine_version="$(sudo ros engine list | awk '{print $2}' | grep ${docker_version} | tail -n 1)"
143+
+ if [ "$engine_version" != "" ]; then
144+
+ $sh_c "ros engine switch -f $engine_version"
145+
+ fi
146+
+ )
147+
+ exit 0
148+
+ ;;
149+
*)
150+
if [ -z "$lsb_dist" ]; then
151+
if is_darwin; then

‎pkg/28.0.1/config.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
3+
DOCKER_GIT_COMMIT="4c94a56999e10efcf48c5b8e3f6afea464f9108e"
4+
5+
TEST_OS_IMAGE_NAME=(oraclelinux ubuntu rockylinux redhat/ubi9 quay.io/centos/centos redhat/ubi8)
6+
TEST_OS_IMAGE_TAG[0]="8 9"
7+
TEST_OS_IMAGE_TAG[1]="22.04 24.04"
8+
TEST_OS_IMAGE_TAG[2]="8 9"
9+
TEST_OS_IMAGE_TAG[3]="9.4"
10+
TEST_OS_IMAGE_TAG[4]="stream9"
11+
TEST_OS_IMAGE_TAG[5]="8.9"

0 commit comments

Comments
 (0)