From d3361d21d8842c6f5583dfa27998035ec4aa1014 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 18 Aug 2015 15:55:40 -0400 Subject: [PATCH 1/2] Remove provides statement from control file --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 4aaa8d13c..2c0cc539d 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,5 @@ Priority: optional Architecture: amd64 Depends: locales, git, make, curl, software-properties-common, lxc-docker-1.6.2, gcc, python-software-properties, man-db, buildstep, sshcommand, pluginhook Pre-Depends: nginx, dnsutils, ruby, ruby-dev, rubygem-rack, rubygem-rack-protection, rubygem-sinatra, rubygem-tilt, apparmor, cgroup-lite -Provides: dokku Maintainer: Jose Diaz-Gonzalez Description: Docker powered mini-Heroku in around 100 lines of Bash From 2b59932ba512489340983d9e98b1d1eea8aa33b2 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 19 Aug 2015 20:23:06 -0400 Subject: [PATCH 2/2] Use https version of docker repository. Refs #1396 --- Makefile | 2 +- bootstrap.sh | 2 +- contrib/stackscript.sh | 2 +- deb.mk | 2 +- docs/getting-started/install/debian.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 715ff4a4b..dacbc8464 100644 --- a/Makefile +++ b/Makefile @@ -88,7 +88,7 @@ docker: aufs usermod -aG docker dokku ifndef CI curl -sSL https://get.docker.com/gpg | apt-key add - - echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list + echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list apt-get update ifdef DOCKER_VERSION apt-get install -qq -y lxc-docker-${DOCKER_VERSION} diff --git a/bootstrap.sh b/bootstrap.sh index 35d6f6da9..3f2f8125e 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -45,7 +45,7 @@ dokku_install_package() { curl -sSL https://get.docker.io/gpg | apt-key add - curl -sSL https://packagecloud.io/gpg.key | apt-key add - - echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list + echo "deb https://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" > /etc/apt/sources.list.d/dokku.list apt-get update > /dev/null diff --git a/contrib/stackscript.sh b/contrib/stackscript.sh index df1676eff..de28eeffb 100644 --- a/contrib/stackscript.sh +++ b/contrib/stackscript.sh @@ -149,7 +149,7 @@ function install_prerequisites { sudo apt-get install -qq -y apt-transport-https > /dev/null 2>&1 logit "Setting up apt repositories" - echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list + echo "deb https://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" > /etc/apt/sources.list.d/dokku.list logit "Running apt-get update" diff --git a/deb.mk b/deb.mk index 1f361f072..97f9a91cf 100644 --- a/deb.mk +++ b/deb.mk @@ -40,7 +40,7 @@ install-from-deb: curl --silent https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - 2>&1 >/dev/null echo "--> Setting up apt repositories" - echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list + echo "deb https://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" > /etc/apt/sources.list.d/dokku.list echo "--> Running apt-get update" diff --git a/docs/getting-started/install/debian.md b/docs/getting-started/install/debian.md index 80d47d299..d7c469281 100644 --- a/docs/getting-started/install/debian.md +++ b/docs/getting-started/install/debian.md @@ -6,7 +6,7 @@ As of 0.3.18, dokku defaults to being installed via debian package. While certai curl -sL https://get.docker.io/gpg 2> /dev/null | sudo apt-key add - 2>&1 >/dev/null curl -sL https://packagecloud.io/gpg.key 2> /dev/null | sudo apt-key add - 2>&1 >/dev/null -echo "deb http://get.docker.io/ubuntu docker main" | sudo tee /etc/apt/sources.list.d/docker.list >/dev/null +echo "deb https://get.docker.io/ubuntu docker main" | sudo tee /etc/apt/sources.list.d/docker.list >/dev/null echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/dokku.list >/dev/null sudo apt-get update -qq