github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

feat: install stable docker when using bootstrap script

Browse Source 
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:
Jose Diaz-Gonzalez
2019-01-07 06:40:03 -05:00
parent 093fafe0b7
commit 5c0b350cff
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bootstrap.sh
View File

@@ -138,14 +138,17 @@ 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
echo "--> Installing docker" if ! command -v docker &>/dev/null; then
if uname -r | grep -q linode; then echo "--> Installing docker"
echo "--> NOTE: Using Linode? Docker may complain about missing AUFS support." if uname -r | grep -q linode; then
echo " You can safely ignore this warning." echo "--> NOTE: Using Linode? Docker may complain about missing AUFS support."
echo " Installation will continue in 10 seconds." echo " You can safely ignore this warning."
sleep 10 echo " Installation will continue in 10 seconds."
sleep 10
fi
export CHANNEL=stable
wget -nv -O - https://get.docker.com/ | sh
fi fi
wget -nv -O - https://get.docker.com/ | sh
if [[ "$DOKKU_DISTRO_VERSION" == "14.04" ]]; then if [[ "$DOKKU_DISTRO_VERSION" == "14.04" ]]; then
echo "--> Adding nginx PPA" echo "--> Adding nginx PPA"