From cf0f047285d2bf26818b1121932feb0cc90a6d53 Mon Sep 17 00:00:00 2001 From: lachtan Date: Fri, 30 Sep 2022 18:47:50 +0200 Subject: [PATCH] Tune Docker CE installation script --- scripts/docker-ce-install.sh | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/scripts/docker-ce-install.sh b/scripts/docker-ce-install.sh index a5b0992..bcf80e9 100755 --- a/scripts/docker-ce-install.sh +++ b/scripts/docker-ce-install.sh @@ -3,18 +3,16 @@ # https://docs.docker.com/engine/install/ubuntu/ set -x +set -e -apt-get remove docker docker-engine docker.io containerd runc - -apt-get update - -apt-get install ca-certificates curl gnupg lsb-release - -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg +sudo apt-get remove -y --ignore-missing docker docker.io containerd runc +sudo apt-get update +sudo apt-get install -y ca-certificates curl gnupg lsb-release +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg echo \ "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \ - $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null + $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null -apt-get update -apt-get install docker-ce docker-ce-cli containerd.io +sudo apt-get update +sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose docker-compose-plugin