mirror of https://github.com/docker/docs.git
redhat: remove configure repo as we use our own rpms now
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
parent
0920a2de1b
commit
0dbfcd5535
|
@ -99,20 +99,6 @@ func (provisioner *RedHatProvisioner) isAWS() bool {
|
|||
return true
|
||||
}
|
||||
|
||||
func (provisioner *RedHatProvisioner) configureRepos() error {
|
||||
log.Debug("configuring extra repo")
|
||||
repoCmd := "subscription-manager repos --enable=rhel-7-server-extras-rpms"
|
||||
if provisioner.isAWS() {
|
||||
repoCmd = "yum-config-manager --enable rhui-REGION-rhel-server-extras"
|
||||
}
|
||||
|
||||
if _, err := provisioner.SSHCommand(fmt.Sprintf("sudo %s", repoCmd)); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func installDocker(provisioner *RedHatProvisioner) error {
|
||||
if err := provisioner.installOfficialDocker(); err != nil {
|
||||
return err
|
||||
|
@ -163,11 +149,6 @@ func (provisioner *RedHatProvisioner) Provision(swarmOptions swarm.SwarmOptions,
|
|||
return err
|
||||
}
|
||||
|
||||
// setup extras repo
|
||||
if err := provisioner.configureRepos(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for _, pkg := range provisioner.Packages {
|
||||
if err := provisioner.Package(pkg, pkgaction.Install); err != nil {
|
||||
return err
|
||||
|
|
Loading…
Reference in New Issue