From dd104c9490fc796c7bbabf97784a0bd1b75b7569 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 4 Jan 2022 13:07:09 -0500 Subject: [PATCH 1/3] Add holds for ubuntu --- setup/so-functions | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup/so-functions b/setup/so-functions index 12a252c46..cf47a0f8c 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1214,8 +1214,10 @@ docker_install() { esac if [ $OSVER == "bionic" ]; then retry 50 10 "apt-get -y install docker-ce=5:20.10.5~3-0~ubuntu-bionic docker-ce-cli=5:20.10.5~3-0~ubuntu-bionic docker-ce-rootless-extras=5:20.10.5~3-0~ubuntu-bionic python3-docker" >> "$setup_log" 2>&1 || exit 1 + apt-mark hold docker-ce docker-ce-cli docker-ce-rootless-extras elif [ $OSVER == "focal" ]; then retry 50 10 "apt-get -y install docker-ce=5:20.10.8~3-0~ubuntu-focal docker-ce-cli=5:20.10.8~3-0~ubuntu-focal docker-ce-rootless-extras=5:20.10.8~3-0~ubuntu-focal python3-docker" >> "$setup_log" 2>&1 || exit 1 + apt-mark hold docker-ce docker-ce-cli docker-ce-rootless-extras fi fi docker_registry From e869013057b3796fc9e003c3c55332a0c34362f7 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 4 Jan 2022 15:24:10 -0500 Subject: [PATCH 2/3] Remove docker the reinstall it --- setup/so-functions | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup/so-functions b/setup/so-functions index cf47a0f8c..23692e7ec 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1213,9 +1213,13 @@ docker_install() { ;; esac if [ $OSVER == "bionic" ]; then + service docker stop + apt -y purge docker-ce docker-ce-cli docker-ce-rootless-extras retry 50 10 "apt-get -y install docker-ce=5:20.10.5~3-0~ubuntu-bionic docker-ce-cli=5:20.10.5~3-0~ubuntu-bionic docker-ce-rootless-extras=5:20.10.5~3-0~ubuntu-bionic python3-docker" >> "$setup_log" 2>&1 || exit 1 apt-mark hold docker-ce docker-ce-cli docker-ce-rootless-extras elif [ $OSVER == "focal" ]; then + service docker stop + apt -y purge docker-ce docker-ce-cli docker-ce-rootless-extras retry 50 10 "apt-get -y install docker-ce=5:20.10.8~3-0~ubuntu-focal docker-ce-cli=5:20.10.8~3-0~ubuntu-focal docker-ce-rootless-extras=5:20.10.8~3-0~ubuntu-focal python3-docker" >> "$setup_log" 2>&1 || exit 1 apt-mark hold docker-ce docker-ce-cli docker-ce-rootless-extras fi From 3ca0ce9eea6362b8d8da46256f529a7df70bb49d Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 4 Jan 2022 18:47:35 -0500 Subject: [PATCH 3/3] Update so-functions --- setup/so-functions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 23692e7ec..8352d0430 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1213,15 +1213,15 @@ docker_install() { ;; esac if [ $OSVER == "bionic" ]; then - service docker stop + service docker stop apt -y purge docker-ce docker-ce-cli docker-ce-rootless-extras retry 50 10 "apt-get -y install docker-ce=5:20.10.5~3-0~ubuntu-bionic docker-ce-cli=5:20.10.5~3-0~ubuntu-bionic docker-ce-rootless-extras=5:20.10.5~3-0~ubuntu-bionic python3-docker" >> "$setup_log" 2>&1 || exit 1 apt-mark hold docker-ce docker-ce-cli docker-ce-rootless-extras elif [ $OSVER == "focal" ]; then - service docker stop + service docker stop apt -y purge docker-ce docker-ce-cli docker-ce-rootless-extras retry 50 10 "apt-get -y install docker-ce=5:20.10.8~3-0~ubuntu-focal docker-ce-cli=5:20.10.8~3-0~ubuntu-focal docker-ce-rootless-extras=5:20.10.8~3-0~ubuntu-focal python3-docker" >> "$setup_log" 2>&1 || exit 1 - apt-mark hold docker-ce docker-ce-cli docker-ce-rootless-extras + apt-mark hold docker-ce docker-ce-cli docker-ce-rootless-extras fi fi docker_registry