diff options
| author | Ryan Hallisey <rhallise@redhat.com> | 2015-11-03 23:30:35 -0500 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2015-11-04 09:32:08 -0500 |
| commit | 0340bc4043bd65fbc975c11a86ba89e20293be0a (patch) | |
| tree | e3c2167f68628e305cc49f3dee6fadb051a56c20 /docker | |
| parent | c2d2d7ec1229879107bbf3b7ad7f7bf28b351bc0 (diff) | |
| download | kolla-0340bc4043bd65fbc975c11a86ba89e20293be0a.tar.gz kolla-0340bc4043bd65fbc975c11a86ba89e20293be0a.zip | |
Fix RHEL builds
Register with RHEL on the host machine and use yum to setup
the repos in the container.
Change-Id: I38aaf43fffaf7a235e69b330d5d9f0f1be31fe83
Backport: Liberty
Closes-Bug: #1513088
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 755060231..378826c47 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -58,8 +58,8 @@ RUN curl http://trunk.rdoproject.org/centos7/delorean-deps.repo -o /etc/yum.repo {% if install_metatype == 'rhos' %} # Turn on the RHOS 7.0 repo for RHOS -RUN subscription-manager repos --enable rhel-7-server-rpms \ - && subscription-manager repos --enable rhel-7-server-openstack-7.0-rpms +RUN yum-config-manager --enable rhel-7-server-rpms \ + && yum-config-manager --enable rhel-7-server-openstack-7.0-rpms {% endif %} @@ -82,8 +82,8 @@ RUN rpm -e --nodeps systemd-container systemd-container-libs \ RUN yum install -y \ https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ && yum clean all \ - && subscription-manager repos --enable rhel-7-server-optional-rpms \ - && subscription-manager repos --enable rhel-7-server-extras-rpms + && yum-config-manager --enable rhel-7-server-optional-rpms \ + && yum-config-manager --enable rhel-7-server-extras-rpms {% endif %} # Endif for base_distro RHEL |