Minor fixes.
This commit is contained in:
parent
1310e854bb
commit
28018ff26b
|
|
@ -8,7 +8,7 @@ set -x
|
||||||
# echo "deb http://apt.dockerproject.org/repo debian-stretch main" >> /etc/apt/sources.list.d/docker.list
|
# echo "deb http://apt.dockerproject.org/repo debian-stretch main" >> /etc/apt/sources.list.d/docker.list
|
||||||
|
|
||||||
#KEY_DIR=/etc/apt/trusted.gpg.d
|
#KEY_DIR=/etc/apt/trusted.gpg.d
|
||||||
KEY_DIR=/usr/share/keyrings/
|
KEY_DIR=/usr/share/keyrings
|
||||||
KEY=${KEY_DIR}/docker.gpg
|
KEY=${KEY_DIR}/docker.gpg
|
||||||
sudo mkdir -p ${KEY_DIR}
|
sudo mkdir -p ${KEY_DIR}
|
||||||
KEY_URL="https://download.docker.com/linux/debian/gpg"
|
KEY_URL="https://download.docker.com/linux/debian/gpg"
|
||||||
|
|
@ -31,9 +31,9 @@ Components: stable
|
||||||
Signed-By: "${KEY}"
|
Signed-By: "${KEY}"
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
conf_print_docker_sources | tee /etc/apt/sources.list-available/docker.list
|
conf_print_docker_sources | tee /etc/apt/sources.list-available/docker.sources
|
||||||
|
|
||||||
ln -sf /etc/apt/sources.list-available/docker.list /etc/apt/sources.list.d/docker.list
|
ln -sf /etc/apt/sources.list-available/docker.sources /etc/apt/sources.list.d/docker.sources
|
||||||
|
|
||||||
# Bypass apt-proxy for docker packages
|
# Bypass apt-proxy for docker packages
|
||||||
if [ -f /etc/apt/apt.conf.d/02proxy ]; then
|
if [ -f /etc/apt/apt.conf.d/02proxy ]; then
|
||||||
|
|
@ -50,18 +50,18 @@ apt install -y \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
pass \
|
pass \
|
||||||
gnupg2 \
|
gnupg2
|
||||||
software-properties-common
|
# software-properties-common
|
||||||
|
|
||||||
apt install -y \
|
apt install -y \
|
||||||
docker-ce \
|
docker-ce \
|
||||||
docker-ce-cli \
|
docker-ce-cli \
|
||||||
docker-ce-rootless-extras \
|
|
||||||
containerd.io \
|
containerd.io \
|
||||||
docker-compose-plugin \
|
docker-compose-plugin \
|
||||||
docker-buildx-plugin \
|
docker-buildx-plugin \
|
||||||
python3-docker \
|
python3-docker \
|
||||||
python3-compose
|
python3-compose
|
||||||
|
# docker-ce-rootless-extras \
|
||||||
|
|
||||||
# docker scout
|
# docker scout
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue