fixed issue-3145, enable engine-install-url in CentOS.

Signed-off-by: Jie Zhang <zhangjie0220@gmail.com>
This commit is contained in:
Jie Zhang 2016-03-14 14:24:44 +08:00
parent 475053cd7f
commit 93fe1d199f
1 changed files with 1 additions and 15 deletions

View File

@ -110,7 +110,7 @@ func (provisioner *RedHatProvisioner) Package(name string, action pkgaction.Pack
} }
func installDocker(provisioner *RedHatProvisioner) error { func installDocker(provisioner *RedHatProvisioner) error {
if err := provisioner.installOfficialDocker(); err != nil { if err := installDockerGeneric(provisioner, provisioner.EngineOptions.InstallURL); err != nil {
return err return err
} }
@ -125,20 +125,6 @@ func installDocker(provisioner *RedHatProvisioner) error {
return nil 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 { func (provisioner *RedHatProvisioner) dockerDaemonResponding() bool {
log.Debug("checking docker daemon") log.Debug("checking docker daemon")