Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-16 20:17:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use wget instead of curl when bootstrapping

Browse Source
This commit is contained in:
Dan Callahan
2015-11-09 22:52:58 -06:00
parent bb9fd8b320
commit a49adef9b0
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -99,11 +99,10 @@ plugn:
tar xzf /tmp/plugn_latest.tgz -C /usr/local/bin tar xzf /tmp/plugn_latest.tgz -C /usr/local/bin
docker: aufs docker: aufs
apt-get install -qq -y curl
egrep -i "^docker" /etc/group || groupadd docker egrep -i "^docker" /etc/group || groupadd docker
usermod -aG docker dokku usermod -aG docker dokku
ifndef CI ifndef CI
curl -sSL https://get.docker.com/ | sh wget -nv -O - https://get.docker.com/ | sh
ifdef DOCKER_VERSION ifdef DOCKER_VERSION
apt-get install -qq -y docker-engine=${DOCKER_VERSION} || (apt-cache madison docker-engine ; exit 1) apt-get install -qq -y docker-engine=${DOCKER_VERSION} || (apt-cache madison docker-engine ; exit 1)
endif endif
@@ -123,7 +122,7 @@ ifdef BUILD_STACK
else else
ifeq ($(shell echo ${PREBUILT_STACK_URL} | egrep -q 'http.*://|file://' && echo $$?),0) ifeq ($(shell echo ${PREBUILT_STACK_URL} | egrep -q 'http.*://|file://' && echo $$?),0)
@echo "Start importing herokuish from ${PREBUILT_STACK_URL}" @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 else
@echo "Start pulling herokuish from ${PREBUILT_STACK_URL}" @echo "Start pulling herokuish from ${PREBUILT_STACK_URL}"
docker images | grep gliderlabs/herokuish || docker pull ${PREBUILT_STACK_URL} docker images | grep gliderlabs/herokuish || docker pull ${PREBUILT_STACK_URL}

7
bootstrap.sh
View File

@@ -7,7 +7,7 @@
# We wrap this whole script in a function, so that we won't execute # We wrap this whole script in a function, so that we won't execute
# until the entire script is downloaded. # 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. # 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 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 [[ $(lsb_release -sr) == "12.04" ]] && apt-get install -qq -y python-software-properties
dokku_install_source() { dokku_install_source() {
@@ -58,10 +57,10 @@ dokku_install_package() {
echo " Installation will continue in 10 seconds." echo " Installation will continue in 10 seconds."
sleep 10 sleep 10
fi fi
curl -sSL https://get.docker.com/ | sh wget -nv -O - https://get.docker.com/ | sh
echo "--> Installing dokku" 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 echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | tee /etc/apt/sources.list.d/dokku.list
apt-get update -qq > /dev/null apt-get update -qq > /dev/null

2
contrib/dokku-installer.rb
View File

@@ -35,7 +35,7 @@ end
version = "v0.4.4" version = "v0.4.4"
dokku_root = ENV["DOKKU_ROOT"] || "/home/dokku" dokku_root = ENV["DOKKU_ROOT"] || "/home/dokku"
admin_keys = `cat /root/.ssh/authorized_keys`.split("\n") 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 template = DATA.read
set :port, 2000 set :port, 2000

6
deb.mk
View File

@@ -31,13 +31,13 @@ GOPATH = /home/vagrant/gocode
install-from-deb: install-from-deb:
echo "--> Initial apt-get update" echo "--> Initial apt-get update"
sudo apt-get update -qq > /dev/null 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" echo "--> Installing docker"
curl -sSL https://get.docker.com/ | sh wget -nv -O - https://get.docker.com/ | sh
echo "--> Installing dokku" 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 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 update -qq > /dev/null
sudo apt-get install dokku sudo apt-get install dokku

6
docs/getting-started/install/debian.md
View File

@@ -5,13 +5,13 @@ As of 0.3.18, dokku defaults to being installed via debian package. While certai
```shell ```shell
# install prerequisites # install prerequisites
sudo apt-get update -qq > /dev/null 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 # install docker
curl -sSL https://get.docker.com/ | sh wget -nv -O - https://get.docker.com/ | sh
# install dokku # 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 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 update -qq > /dev/null
sudo apt-get install dokku sudo apt-get install dokku