feat: install stable docker when using bootstrap script
This script previously ran through the docker installation process with the edge channel on each run. Instead, we only run the docker installation if docker is not available. In addition, we force set the channel to stable, ensuring the script installs the correct channel for stable docker installations. Closes #3269
This commit is contained in:
1 parent
093fafe0b7
commit
5c0b350cff
1 file changed
+3
@@ -138,6 +138,7 @@ install-dokku-from-deb-package() {
|
|||||||
apt-get update -qq >/dev/null
|
apt-get update -qq >/dev/null
|
||||||
apt-get -qq -y install apt-transport-https
|
apt-get -qq -y install apt-transport-https
|
||||||
|
|
||||||
|
if ! command -v docker &>/dev/null; then
|
||||||
echo "--> Installing docker"
|
echo "--> Installing docker"
|
||||||
if uname -r | grep -q linode; then
|
if uname -r | grep -q linode; then
|
||||||
echo "--> NOTE: Using Linode? Docker may complain about missing AUFS support."
|
echo "--> NOTE: Using Linode? Docker may complain about missing AUFS support."
|
||||||
@@ -145,7 +146,9 @@ install-dokku-from-deb-package() {
|
|||||||
echo " Installation will continue in 10 seconds."
|
echo " Installation will continue in 10 seconds."
|
||||||
sleep 10
|
sleep 10
|
||||||
fi
|
fi
|
||||||
|
export CHANNEL=stable
|
||||||
wget -nv -O - https://get.docker.com/ | sh
|
wget -nv -O - https://get.docker.com/ | sh
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ "$DOKKU_DISTRO_VERSION" == "14.04" ]]; then
|
if [[ "$DOKKU_DISTRO_VERSION" == "14.04" ]]; then
|
||||||
echo "--> Adding nginx PPA"
|
echo "--> Adding nginx PPA"
|
||||||
|
|||||||
Reference in new issue
Block a user