docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2649 from dgageot/2540-honor-engine-install-url 

FIX #2540 provisioners honor engine-install-url
This commit is contained in:
Jean-Laurent de Morlhon 2015-12-22 09:53:40 +01:00
parent f2ca6b8bd0 280f9c6cc6
commit 5ee9dfdc94
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libmachine/provision/debian.go
View File

@ -62,13 +62,10 @@ func (provisioner *DebianProvisioner) Package(name string, action pkgaction.Pack
if action == pkgaction.Upgrade && name == "docker-engine" { if action == pkgaction.Upgrade && name == "docker-engine" {
// run the force remove on the existing lxc-docker package // run the force remove on the existing lxc-docker package
// and remove the existing apt source list // and remove the existing apt source list
// also re-run the get.docker.com script to properly setup
// the system again
commands := []string{ commands := []string{
"rm /etc/apt/sources.list.d/docker.list || true", "rm /etc/apt/sources.list.d/docker.list || true",
"apt-get remove -y lxc-docker || true", "apt-get remove -y lxc-docker || true",
"curl -sSL https://get.docker.com | sh",
} }
for _, cmd := range commands { for _, cmd := range commands {

3
libmachine/provision/ubuntu_systemd.go
View File

@ -78,13 +78,10 @@ func (provisioner *UbuntuSystemdProvisioner) Package(name string, action pkgacti
if action == pkgaction.Upgrade && name == "docker-engine" { if action == pkgaction.Upgrade && name == "docker-engine" {
// run the force remove on the existing lxc-docker package // run the force remove on the existing lxc-docker package
// and remove the existing apt source list // and remove the existing apt source list
// also re-run the get.docker.com script to properly setup
// the system again
commands := []string{ commands := []string{
"rm /etc/apt/sources.list.d/docker.list || true", "rm /etc/apt/sources.list.d/docker.list || true",
"apt-get remove -y lxc-docker || true", "apt-get remove -y lxc-docker || true",
"curl -sSL https://get.docker.com | sh",
} }
for _, cmd := range commands { for _, cmd := range commands {

3
libmachine/provision/ubuntu_upstart.go
View File

@ -97,13 +97,10 @@ func (provisioner *UbuntuProvisioner) Package(name string, action pkgaction.Pack
if action == pkgaction.Upgrade && name == "docker-engine" { if action == pkgaction.Upgrade && name == "docker-engine" {
// run the force remove on the existing lxc-docker package // run the force remove on the existing lxc-docker package
// and remove the existing apt source list // and remove the existing apt source list
// also re-run the get.docker.com script to properly setup
// the system again
commands := []string{ commands := []string{
"rm /etc/apt/sources.list.d/docker.list || true", "rm /etc/apt/sources.list.d/docker.list || true",
"apt-get remove -y lxc-docker || true", "apt-get remove -y lxc-docker || true",
"curl -sSL https://get.docker.com | sh",
} }
for _, cmd := range commands { for _, cmd := range commands {