diff --git a/Makefile b/Makefile index b6889e4287d..6e3add4892a 100644 --- a/Makefile +++ b/Makefile @@ -99,11 +99,10 @@ plugn: tar xzf /tmp/plugn_latest.tgz -C /usr/local/bin docker: aufs - apt-get install -qq -y curl egrep -i "^docker" /etc/group || groupadd docker usermod -aG docker dokku ifndef CI - curl -sSL https://get.docker.com/ | sh + wget -nv -O - https://get.docker.com/ | sh ifdef DOCKER_VERSION apt-get install -qq -y docker-engine=${DOCKER_VERSION} || (apt-cache madison docker-engine ; exit 1) endif @@ -123,7 +122,7 @@ ifdef BUILD_STACK else ifeq ($(shell echo ${PREBUILT_STACK_URL} | egrep -q 'http.*://|file://' && echo $$?),0) @echo "Start importing herokuish from ${PREBUILT_STACK_URL}" - docker images | grep gliderlabs/herokuish || curl --silent -L ${PREBUILT_STACK_URL} | gunzip -cd | docker import - gliderlabs/herokuish + docker images | grep gliderlabs/herokuish || wget -nv -O - ${PREBUILT_STACK_URL} | gunzip -cd | docker import - gliderlabs/herokuish else @echo "Start pulling herokuish from ${PREBUILT_STACK_URL}" docker images | grep gliderlabs/herokuish || docker pull ${PREBUILT_STACK_URL} diff --git a/bootstrap.sh b/bootstrap.sh index 96755627bfc..3c7ffcfe483 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -7,7 +7,7 @@ # We wrap this whole script in a function, so that we won't execute # until the entire script is downloaded. -# That's good because it prevents our output overlapping with curl's. +# That's good because it prevents our output overlapping with wget's. # It also means that we can't run a partially downloaded script. @@ -30,7 +30,6 @@ hostname -f > /dev/null 2>&1 || { } apt-get update -qq > /dev/null -which curl > /dev/null || apt-get install -qq -y curl [[ $(lsb_release -sr) == "12.04" ]] && apt-get install -qq -y python-software-properties dokku_install_source() { @@ -58,10 +57,10 @@ dokku_install_package() { echo " Installation will continue in 10 seconds." sleep 10 fi - curl -sSL https://get.docker.com/ | sh + wget -nv -O - https://get.docker.com/ | sh echo "--> Installing dokku" - curl -sSL https://packagecloud.io/gpg.key | apt-key add - + wget -nv -O - https://packagecloud.io/gpg.key | apt-key add - echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | tee /etc/apt/sources.list.d/dokku.list apt-get update -qq > /dev/null diff --git a/contrib/dokku-installer.rb b/contrib/dokku-installer.rb index e603b364d46..ce0ca6a349d 100755 --- a/contrib/dokku-installer.rb +++ b/contrib/dokku-installer.rb @@ -35,7 +35,7 @@ version = "v0.4.4" dokku_root = ENV["DOKKU_ROOT"] || "/home/dokku" admin_keys = `cat /root/.ssh/authorized_keys`.split("\n") -hostname = `bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || curl icanhazip.com'`.strip +hostname = `bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || wget -q -O - icanhazip.com'`.strip template = DATA.read set :port, 2000 diff --git a/deb.mk b/deb.mk index 25d7d08a223..ef5c16840e6 100644 --- a/deb.mk +++ b/deb.mk @@ -31,13 +31,13 @@ GOPATH = /home/vagrant/gocode install-from-deb: echo "--> Initial apt-get update" sudo apt-get update -qq > /dev/null - sudo apt-get install -qq -y apt-transport-https curl + sudo apt-get install -qq -y apt-transport-https echo "--> Installing docker" - curl -sSL https://get.docker.com/ | sh + wget -nv -O - https://get.docker.com/ | sh echo "--> Installing dokku" - curl -sSL https://packagecloud.io/gpg.key | apt-key add - + wget -nv -O - https://packagecloud.io/gpg.key | apt-key add - echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/dokku.list sudo apt-get update -qq > /dev/null sudo apt-get install dokku diff --git a/docs/getting-started/install/debian.md b/docs/getting-started/install/debian.md index 5352759d54c..683d19ee0cd 100644 --- a/docs/getting-started/install/debian.md +++ b/docs/getting-started/install/debian.md @@ -5,13 +5,13 @@ As of 0.3.18, dokku defaults to being installed via debian package. While certai ```shell # install prerequisites sudo apt-get update -qq > /dev/null -sudo apt-get install -qq -y apt-transport-https curl +sudo apt-get install -qq -y apt-transport-https # install docker -curl -sSL https://get.docker.com/ | sh +wget -nv -O - https://get.docker.com/ | sh # install dokku -curl -sSL https://packagecloud.io/gpg.key | apt-key add - +wget -nv -O - https://packagecloud.io/gpg.key | apt-key add - echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/dokku.list sudo apt-get update -qq > /dev/null sudo apt-get install dokku