mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-06 09:12:45 +01:00
Merge pull request #6752 from Security-Onion-Solutions/ubufix
Fix docker holds so re-install will work properly
This commit is contained in:
@@ -1213,9 +1213,15 @@ docker_install() {
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
if [ $OSVER == "bionic" ]; then
|
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
|
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
|
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
|
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
|
||||||
fi
|
fi
|
||||||
docker_registry
|
docker_registry
|
||||||
|
|||||||
Reference in New Issue
Block a user