diff options
| author | David Moreau Simard <dms@redhat.com> | 2015-12-15 12:05:39 -0500 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2015-12-24 02:08:52 +0000 |
| commit | e8ad7488f6a2f78917eeff159291c5d63e899e47 (patch) | |
| tree | 8d17977e5ce43d4cd6fb720d23162d1625e3fc98 /docker/base/Dockerfile.j2 | |
| parent | d7095790a2f1a1c390785ecac058fe32cc1e90e2 (diff) | |
| download | kolla-e8ad7488f6a2f78917eeff159291c5d63e899e47.tar.gz kolla-e8ad7488f6a2f78917eeff159291c5d63e899e47.zip | |
Make the yum repositories configurable in the base image
- Removed hardcoded yum repository configuration in favor of
commands dynamically generated based on repo-url and repo-file
arguments. We maintain a sane default set of repositories.
- Added generic rpm_setup_config parameter to add support for
installing .rpm or .repo files before building containers.
Co-Authored-By: Ryan Hallisey <rhallise@redhat.com>
Implements: blueprint custom-repos
Change-Id: I1b3a7647a9e7239de3cd162cb6f464f05632bde1
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 22457700c..31e222da8 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -53,9 +53,9 @@ RUN rpm --import https://yum.mariadb.org/RPM-GPG-KEY-MariaDB && \ {% if install_metatype in ['rdo', 'mixed'] %} -# These repos provide latest packages built from trunk master into RPMs -RUN curl http://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean.repo -RUN curl http://trunk.rdoproject.org/centos7/delorean-deps.repo -o /etc/yum.repos.d/delorean-deps.repo +{% for cmd in rpm_setup %} +{{ cmd }} +{% endfor %} {% endif %} {# endif for repo setup for all RHEL except RHEL OSP #} |