Merge pull request #1397 from progrium/https-docker-apt-repo
Https docker apt repo
This commit is contained in:
commit
9433ab3076
6 files changed
+5
-6
No files matched your search
@@ -88,7 +88,7 @@ docker: aufs
|
|||||||
usermod -aG docker dokku
|
usermod -aG docker dokku
|
||||||
ifndef CI
|
ifndef CI
|
||||||
curl -sSL https://get.docker.com/gpg | apt-key add -
|
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
|
apt-get update
|
||||||
ifdef DOCKER_VERSION
|
ifdef DOCKER_VERSION
|
||||||
apt-get install -qq -y lxc-docker-${DOCKER_VERSION}
|
apt-get install -qq -y lxc-docker-${DOCKER_VERSION}
|
||||||
|
|||||||
+1
-1
@@ -45,7 +45,7 @@ dokku_install_package() {
|
|||||||
curl -sSL https://get.docker.io/gpg | apt-key add -
|
curl -sSL https://get.docker.io/gpg | apt-key add -
|
||||||
curl -sSL https://packagecloud.io/gpg.key | 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
|
echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" > /etc/apt/sources.list.d/dokku.list
|
||||||
|
|
||||||
apt-get update > /dev/null
|
apt-get update > /dev/null
|
||||||
|
|||||||
@@ -149,7 +149,7 @@ function install_prerequisites {
|
|||||||
sudo apt-get install -qq -y apt-transport-https > /dev/null 2>&1
|
sudo apt-get install -qq -y apt-transport-https > /dev/null 2>&1
|
||||||
|
|
||||||
logit "Setting up apt repositories"
|
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
|
echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" > /etc/apt/sources.list.d/dokku.list
|
||||||
|
|
||||||
logit "Running apt-get update"
|
logit "Running apt-get update"
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ install-from-deb:
|
|||||||
curl --silent https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - 2>&1 >/dev/null
|
curl --silent https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - 2>&1 >/dev/null
|
||||||
|
|
||||||
echo "--> Setting up apt repositories"
|
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 "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" > /etc/apt/sources.list.d/dokku.list
|
||||||
|
|
||||||
echo "--> Running apt-get update"
|
echo "--> Running apt-get update"
|
||||||
|
|||||||
Vendored
-1
@@ -5,6 +5,5 @@ Priority: optional
|
|||||||
Architecture: amd64
|
Architecture: amd64
|
||||||
Depends: locales, git, make, curl, software-properties-common, lxc-docker-1.6.2, gcc, python-software-properties, man-db, buildstep, sshcommand, pluginhook
|
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
|
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 <dokku@josediazgonzalez.com>
|
Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
|
||||||
Description: Docker powered mini-Heroku in around 100 lines of Bash
|
Description: Docker powered mini-Heroku in around 100 lines of Bash
|
||||||
@@ -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://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
|
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
|
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
|
sudo apt-get update -qq
|
||||||
|
|||||||
Reference in new issue
Block a user