Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

Commit e6764e2

Browse files
nicholasdillenicholasdille
committed
[skip ci] Fixed Docker #4843 
1 parent bdd0b57 commit e6764e2

File tree

11 files changed

+121
-82
lines changed

11 files changed

+121
-82
lines changed

‎tools/docker-prerelease/daemon.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎tools/docker-previous/Dockerfile.template renamed to ‎tools/docker-preview/Dockerfile.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ mkdir -p \
1515
"${prefix}${docker_setup_contrib}/${name}/openrc"
1616
EOF
1717

18-
COPY daemon.json ${prefix}/etc/docker-previous/
18+
COPY daemon.json ${prefix}/etc/docker-preview/
1919

2020
RUN <<EOF
2121
curl --silent --location --fail "https://download.docker.com/linux/static/test/${arch}/docker-${version}.tgz" \

‎tools/docker-preview/daemon.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"bridge": "none",
3+
"data-root": "/var/lib/docker-preview",
4+
"exec-root": "/var/run/docker-preview",
5+
"hosts": [
6+
"unix:///var/run/docker-preview.sock"
7+
],
8+
"ip-masq": false,
9+
"iptables": false
10+
}

‎tools/docker-prerelease/manifest.yaml renamed to ‎tools/docker-preview/manifest.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
name: docker-prerelease
1+
name: docker-preview
22
version: "23.0.0"
3-
binary: ${target}/libexec/docker-prerelease/bin/docker
3+
binary: ${target}/libexec/docker-preview/bin/docker
44
check: ${binary} --version | cut -d, -f1 | cut -d' ' -f3
55
runtime_dependencies:
66
- fuse-overlayfs

‎tools/docker-previous/post_install.sh renamed to ‎tools/docker-preview/post_install.sh

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ if test -f "/etc/group"; then
6868
fi
6969

7070
echo "Configure daemon (@ ${SECONDS} seconds)"
71-
mkdir -p "/etc/docker-previous"
72-
if ! test -f "/etc/docker-previous/daemon.json"; then
71+
mkdir -p "/etc/docker-preview"
72+
if ! test -f "/etc/docker-preview/daemon.json"; then
7373
echo "Initialize dockerd configuration"
74-
echo "{}" >"/etc/docker-previous/daemon.json"
74+
echo "{}" >"/etc/docker-preview/daemon.json"
7575
fi
7676

7777
if test -f "/etc/fstab"; then
@@ -86,65 +86,65 @@ if test -f "/etc/fstab"; then
8686
if grep -qE "^[^:]+:[^:]*:/.+$" /proc/1/cgroup; then
8787
echo "Configuring storage driver for DinD"
8888
# shellcheck disable=SC2094
89-
cat <<< "$(jq '. * {"storage-driver": "fuse-overlayfs"}' "/etc/docker-previous/daemon.json")" >"/etc/docker-previous/daemon.json"
89+
cat <<< "$(jq '. * {"storage-driver": "fuse-overlayfs"}' "/etc/docker-preview/daemon.json")" >"/etc/docker-preview/daemon.json"
9090

9191
else
9292
echo "fuse-overlayfs should be planned for installation."
9393
fi
9494
fi
9595
fi
9696

97-
if ! test "$(jq '."exec-opts" // [] | any(. | startswith("native.cgroupdriver="))' "/etc/docker-previous/daemon.json")" == "true"; then
97+
if ! test "$(jq '."exec-opts" // [] | any(. | startswith("native.cgroupdriver="))' "/etc/docker-preview/daemon.json")" == "true"; then
9898
echo "Configuring native cgroup driver"
9999
# shellcheck disable=SC2094
100-
cat <<< "$(jq '."exec-opts" += ["native.cgroupdriver=cgroupfs"]' "/etc/docker-previous/daemon.json")" >"/etc/docker-previous/daemon.json"
100+
cat <<< "$(jq '."exec-opts" += ["native.cgroupdriver=cgroupfs"]' "/etc/docker-preview/daemon.json")" >"/etc/docker-preview/daemon.json"
101101
fi
102-
if ! test "$(jq '. | keys | any(. == "default-runtime")' "/etc/docker-previous/daemon.json")" == true; then
102+
if ! test "$(jq '. | keys | any(. == "default-runtime")' "/etc/docker-preview/daemon.json")" == true; then
103103
echo "Set default runtime"
104104
# shellcheck disable=SC2094
105-
cat <<< "$(jq '. * {"default-runtime": "runc"}' "/etc/docker-previous/daemon.json")" >"/etc/docker-previous/daemon.json"
105+
cat <<< "$(jq '. * {"default-runtime": "runc"}' "/etc/docker-preview/daemon.json")" >"/etc/docker-preview/daemon.json"
106106
fi
107107
# shellcheck disable=SC2016
108-
if test -n "${docker_address_base}" && test -n "${docker_address_size}" && ! test "$(jq --arg base "${docker_address_base}" --arg size "${docker_address_size}" '."default-address-pool" | any(.base == $base and .size == $size)' "/etc/docker-previous/daemon.json")" == "true"; then
108+
if test -n "${docker_address_base}" && test -n "${docker_address_size}" && ! test "$(jq --arg base "${docker_address_base}" --arg size "${docker_address_size}" '."default-address-pool" | any(.base == $base and .size == $size)' "/etc/docker-preview/daemon.json")" == "true"; then
109109
echo "Add address pool with base ${docker_address_base} and size ${docker_address_size}"
110110
# shellcheck disable=SC2094
111-
cat <<< "$(jq --args base "${docker_address_base}" --arg size "${docker_address_size}" '."default-address-pool" += {"base": $base, "size": $size}' "/etc/docker-previous/daemon.json")" >"/etc/docker-previous/daemon.json"
111+
cat <<< "$(jq --args base "${docker_address_base}" --arg size "${docker_address_size}" '."default-address-pool" += {"base": $base, "size": $size}' "/etc/docker-preview/daemon.json")" >"/etc/docker-preview/daemon.json"
112112
fi
113113
# shellcheck disable=SC2016
114-
if test -n "${docker_hub_mirror}" && ! test "$(jq --arg mirror "${docker_hub_mirror}" '."registry-mirrors" // [] | any(. == $mirror)' "/etc/docker-previous/daemon.json")" == "true"; then
114+
if test -n "${docker_hub_mirror}" && ! test "$(jq --arg mirror "${docker_hub_mirror}" '."registry-mirrors" // [] | any(. == $mirror)' "/etc/docker-preview/daemon.json")" == "true"; then
115115
echo "Add registry mirror ${docker_hub_mirror}"
116116
# shellcheck disable=SC2094
117117
# shellcheck disable=SC2016
118-
cat <<< "$(jq --args mirror "${docker_hub_mirror}" '."registry-mirrors" += ["\($mirror)"]' "/etc/docker-previous/daemon.json")" >"/etc/docker-previous/daemon.json"
118+
cat <<< "$(jq --args mirror "${docker_hub_mirror}" '."registry-mirrors" += ["\($mirror)"]' "/etc/docker-preview/daemon.json")" >"/etc/docker-preview/daemon.json"
119119
fi
120-
if ! test "$(jq --raw-output '.features.buildkit // false' "/etc/docker-previous/daemon.json")" == true; then
120+
if ! test "$(jq --raw-output '.features.buildkit // false' "/etc/docker-preview/daemon.json")" == true; then
121121
echo "Enable BuildKit"
122122
# shellcheck disable=SC2094
123-
cat <<< "$(jq '. * {"features":{"buildkit":true}}' "/etc/docker-previous/daemon.json")" >"/etc/docker-previous/daemon.json"
123+
cat <<< "$(jq '. * {"features":{"buildkit":true}}' "/etc/docker-preview/daemon.json")" >"/etc/docker-preview/daemon.json"
124124
fi
125125
echo "Check if daemon.json is valid JSON (@ ${SECONDS} seconds)"
126-
if ! jq --exit-status '.' "/etc/docker-previous/daemon.json" >/dev/null 2>&1; then
127-
echo "ERROR /etc/docker-previous/daemon.json is not valid JSON."
126+
if ! jq --exit-status '.' "/etc/docker-preview/daemon.json" >/dev/null 2>&1; then
127+
echo "ERROR /etc/docker-preview/daemon.json is not valid JSON."
128128
exit 1
129129
fi
130130

131131
if is_debian || is_clearlinux; then
132132
echo "Install init script for debian"
133133
mkdir -p "/etc/default" "/etc/init.d"
134-
cp "${docker_setup_contrib}/docker-previous/sysvinit/debian/docker.default" "/etc/default/docker-previous"
135-
cp "${docker_setup_contrib}/docker-previous/sysvinit/debian/docker" "/etc/init.d/docker-previous"
134+
cp "${docker_setup_contrib}/docker-preview/sysvinit/debian/docker.default" "/etc/default/docker-preview"
135+
cp "${docker_setup_contrib}/docker-preview/sysvinit/debian/docker" "/etc/init.d/docker-preview"
136136

137137
elif is_redhat; then
138138
echo "Install init script for redhat"
139139
mkdir -p "/etc/sysconfig" "/etc/init.d"
140-
cp "${docker_setup_contrib}/docker-previous/sysvinit/redhat/docker.sysconfig" "/etc/sysconfig/docker-previous"
141-
cp "${docker_setup_contrib}/docker-previous/sysvinit/redhat/docker" "/etc/init.d/docker-previous"
140+
cp "${docker_setup_contrib}/docker-preview/sysvinit/redhat/docker.sysconfig" "/etc/sysconfig/docker-preview"
141+
cp "${docker_setup_contrib}/docker-preview/sysvinit/redhat/docker" "/etc/init.d/docker-preview"
142142

143143
elif is_alpine; then
144144
echo "Install openrc script for alpine"
145145
mkdir -p "/etc/conf.d" "/etc/init.d"
146-
cp "${docker_setup_contrib}/docker-previous/openrc/docker.confd" "/etc/conf.d/docker-previous"
147-
cp "${docker_setup_contrib}/docker-previous/openrc/docker.initd" "/etc/init.d/docker-previous"
146+
cp "${docker_setup_contrib}/docker-preview/openrc/docker.confd" "/etc/conf.d/docker-preview"
147+
cp "${docker_setup_contrib}/docker-preview/openrc/docker.initd" "/etc/init.d/docker-preview"
148148
openrc
149149
else
150150
echo "Unable to install init script because the distributon is unknown."

‎tools/docker-previous/daemon.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎tools/docker-prerelease/Dockerfile.template renamed to ‎tools/docker-stable/Dockerfile.template

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,32 @@ mkdir -p \
1515
"${prefix}${docker_setup_contrib}/${name}/openrc"
1616
EOF
1717

18-
COPY daemon.json ${prefix}/etc/docker-prerelease/
19-
2018
RUN <<EOF
21-
curl --silent --location --fail "https://download.docker.com/linux/static/test/${arch}/docker-${version}.tgz" \
19+
curl --silent --location --fail "https://download.docker.com/linux/static/stable/${arch}/docker-${version}.tgz" \
2220
| tar --extract --gzip --directory="${prefix}${target}/libexec/${name}/bin" --no-same-owner --strip-components=1
23-
curl --silent --location --fail "https://download.docker.com/linux/static/test/${arch}/docker-rootless-extras-${version}.tgz" \
21+
mv "${prefix}${target}/libexec/${name}/bin/dockerd" "${prefix}${target}/bin/"
22+
mv "${prefix}${target}/libexec/${name}/bin/docker" "${prefix}${target}/bin/"
23+
mv "${prefix}${target}/libexec/${name}/bin/docker-proxy" "${prefix}${target}/bin/"
24+
curl --silent --location --fail "https://download.docker.com/linux/static/stable/${arch}/docker-rootless-extras-${version}.tgz" \
2425
| tar --extract --gzip --directory="${prefix}${target}/libexec/${name}/bin" --no-same-owner --strip-components=1
26+
mv "${prefix}${target}/libexec/${name}/bin/dockerd-rootless.sh" "${prefix}${target}/bin/"
27+
mv "${prefix}${target}/libexec/${name}/bin/dockerd-rootless-setuptool.sh" "${prefix}${target}/bin/"
28+
EOF
29+
30+
RUN <<EOF
31+
curl --silent --location --fail --output "${prefix}${target}/share/bash-completion/completions/docker" \
32+
"https://github.com/docker/cli/raw/v${version}/contrib/completion/bash/docker"
33+
curl --silent --location --fail --output "${prefix}${target}/share/fish/vendor_completions.d/docker.fish" \
34+
"https://github.com/docker/cli/raw/v${version}/contrib/completion/fish/docker.fish"
35+
curl --silent --location --fail --output "${prefix}${target}/share/zsh/vendor-completions/_docker" \
36+
"https://github.com/docker/cli/raw/v${version}/contrib/completion/zsh/_docker"
2537
EOF
2638

2739
RUN <<EOF
2840
curl --silent --location --fail --output "${prefix}/etc/systemd/system/docker.service" \
2941
"https://github.com/moby/moby/raw/v${version}/contrib/init/systemd/docker.service"
3042
sed -i "/^\[Service\]/a Environment=PATH=${target}/libexec/${name}/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" "${prefix}/etc/systemd/system/docker.service"
31-
sed -i -E "s|/usr/bin/dockerd|${target}/libexec/${name}/bin/dockerd|" "${prefix}/etc/systemd/system/docker.service"
43+
sed -i -E "s|/usr/bin/dockerd|${target}/bin/dockerd|" "${prefix}/etc/systemd/system/docker.service"
3244

3345
curl --silent --location --fail --output "${prefix}/etc/systemd/system/docker.socket" \
3446
"https://github.com/moby/moby/raw/v${version}/contrib/init/systemd/docker.socket"
@@ -37,13 +49,11 @@ EOF
3749
RUN <<EOF
3850
curl --silent --location --fail --output "${prefix}${docker_setup_contrib}/${name}/sysvinit/debian/docker.default" \
3951
"https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-debian/docker.default"
40-
echo "DOCKER_OPTS=--config-file /etc/${name}/daemon.json" >>"${prefix}${docker_setup_contrib}/${name}/sysvinit/debian/docker.default"
4152

4253
curl --silent --location --fail --output "${prefix}${docker_setup_contrib}/${name}/sysvinit/debian/docker" \
4354
"https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-debian/docker"
4455
sed -i -E "s|^(export PATH=)|\1${target}/libexec/${name}/bin:|" "${prefix}${docker_setup_contrib}/${name}/sysvinit/debian/docker"
45-
sed -i -E "s|^DOCKERD=/usr/bin/dockerd|DOCKERD=${target}/libexec/${name}/bin/dockerd|" "${prefix}${docker_setup_contrib}/${name}/sysvinit/debian/docker"
46-
sed -i -E "s|^BASE=docker|BASE=${name}|" "${prefix}${docker_setup_contrib}/${name}/sysvinit/debian/docker"
56+
sed -i -E "s|^DOCKERD=/usr/bin/dockerd|DOCKERD=${target}/bin/dockerd|" "${prefix}${docker_setup_contrib}/${name}/sysvinit/debian/docker"
4757
chmod +x "${prefix}${docker_setup_contrib}/${name}/sysvinit/debian/docker"
4858

4959
curl --silent --location --fail --output "${prefix}${docker_setup_contrib}/${name}/sysvinit/redhat/docker.sysconfig" \
@@ -52,15 +62,15 @@ curl --silent --location --fail --output "${prefix}${docker_setup_contrib}/${nam
5262
curl --silent --location --fail --output "${prefix}${docker_setup_contrib}/${name}/sysvinit/redhat/docker" \
5363
"https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-redhat/docker"
5464
sed -i -E "s|(^prog=)|export PATH="${target}/libexec/${name}/bin:${target}/sbin:${target}/bin:\${PATH}"\n\n\1|" "${prefix}${docker_setup_contrib}/${name}/sysvinit/redhat/docker"
55-
sed -i -E "s|/usr/bin/dockerd|${target}/libexec/${name}/bin/dockerd|" "${prefix}${docker_setup_contrib}/${name}/sysvinit/redhat/docker"
65+
sed -i -E "s|/usr/bin/dockerd|${target}/bin/dockerd|" "${prefix}${docker_setup_contrib}/${name}/sysvinit/redhat/docker"
5666
chmod +x "${prefix}${docker_setup_contrib}/${name}/sysvinit/redhat/docker"
5767

5868
curl --silent --location --fail --output "${prefix}${docker_setup_contrib}/${name}/openrc/docker.confd" \
5969
"https://github.com/moby/moby/raw/v${version}/contrib/init/openrc/docker.confd"
60-
sed -i "s|/usr/bin/dockerd|${target}/libexec/${name}/bin/dockerd|" "${prefix}${docker_setup_contrib}/${name}/openrc/docker.confd"
70+
sed -i "s|/usr/bin/dockerd|${target}/bin/dockerd|" "${prefix}${docker_setup_contrib}/${name}/openrc/docker.confd"
6171

6272
curl --silent --location --fail --output "${prefix}${docker_setup_contrib}/${name}/openrc/docker.initd" \
6373
"https://github.com/moby/moby/raw/v${version}/contrib/init/openrc/docker.initd"
6474
sed -i -E "s|^(command=)|export PATH="${target}/libexec/${name}/bin:\${PATH}"\n\n\1|" "${prefix}${docker_setup_contrib}/${name}/openrc/docker.initd"
65-
sed -i "s|/usr/bin/dockerd|${target}/libexec/${name}/bin/dockerd|" "${prefix}${docker_setup_contrib}/${name}/openrc/docker.initd"
66-
EOF
75+
sed -i "s|/usr/bin/dockerd|${target}/bin/dockerd|" "${prefix}${docker_setup_contrib}/${name}/openrc/docker.initd"
76+
EOF

‎tools/docker-previous/manifest.yaml renamed to ‎tools/docker-stable/manifest.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
name: docker-previous
22
version: "20.10.23"
3-
binary: ${target}/libexec/docker-previous/bin/docker
3+
binary: dockerd
44
check: ${binary} --version | cut -d, -f1 | cut -d' ' -f3
55
runtime_dependencies:
66
- fuse-overlayfs
7+
- docker-manpages
8+
platforms:
9+
- linux/amd64
10+
- linux/arm64
711
tags:
812
- org/docker
913
- standard/docker
1014
- standard/oci
1115
- container/runtime
1216
- container/build
17+
- category/default
1318
- type/cli
1419
- type/daemon
15-
- stability/previous
1620
- lang/go
1721
homepage: https://www.docker.com/
1822
description: The Docker CLI

0 commit comments

Comments
 (0)