diff --git a/020_docker.sh b/020_docker.sh index 5cf7d6c..c485f02 100755 --- a/020_docker.sh +++ b/020_docker.sh @@ -8,7 +8,7 @@ set -x # 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=/usr/share/keyrings/ +KEY_DIR=/usr/share/keyrings KEY=${KEY_DIR}/docker.gpg sudo mkdir -p ${KEY_DIR} KEY_URL="https://download.docker.com/linux/debian/gpg" @@ -31,9 +31,9 @@ Components: stable Signed-By: "${KEY}" 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 if [ -f /etc/apt/apt.conf.d/02proxy ]; then @@ -50,18 +50,18 @@ apt install -y \ ca-certificates \ curl \ pass \ - gnupg2 \ - software-properties-common + gnupg2 +# software-properties-common apt install -y \ docker-ce \ docker-ce-cli \ - docker-ce-rootless-extras \ containerd.io \ docker-compose-plugin \ docker-buildx-plugin \ python3-docker \ python3-compose +# docker-ce-rootless-extras \ # docker scout