From 93fe1d199ffef8aa83e694ba133c0526311ea525 Mon Sep 17 00:00:00 2001 From: Jie Zhang Date: Mon, 14 Mar 2016 14:24:44 +0800 Subject: [PATCH] fixed issue-3145, enable engine-install-url in CentOS. Signed-off-by: Jie Zhang --- libmachine/provision/redhat.go | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/libmachine/provision/redhat.go b/libmachine/provision/redhat.go index 8c1ac0ddd8..b145a8b82c 100644 --- a/libmachine/provision/redhat.go +++ b/libmachine/provision/redhat.go @@ -110,7 +110,7 @@ func (provisioner *RedHatProvisioner) Package(name string, action pkgaction.Pack } func installDocker(provisioner *RedHatProvisioner) error { - if err := provisioner.installOfficialDocker(); err != nil { + if err := installDockerGeneric(provisioner, provisioner.EngineOptions.InstallURL); err != nil { return err } @@ -125,20 +125,6 @@ func installDocker(provisioner *RedHatProvisioner) error { return nil } -func (provisioner *RedHatProvisioner) installOfficialDocker() error { - log.Debug("installing docker") - - if err := provisioner.ConfigurePackageList(); err != nil { - return err - } - - if _, err := provisioner.SSHCommand("sudo yum install -y docker-engine"); err != nil { - return err - } - - return nil -} - func (provisioner *RedHatProvisioner) dockerDaemonResponding() bool { log.Debug("checking docker daemon")