diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-10 11:49:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-10 11:49:59 +0000 |
| commit | 89d4134199423339758ae64ee78477d591f78552 (patch) | |
| tree | 0427e1722f9dd544ecfb798c22a5240ec2240d1e | |
| parent | 4cb6d83fea5bbc86c51a37d2db26ad0062334c45 (diff) | |
| parent | 2967f250d706496ad6d724e560868cf4e5aee777 (diff) | |
| download | kolla-89d4134199423339758ae64ee78477d591f78552.tar.gz kolla-89d4134199423339758ae64ee78477d591f78552.zip | |
Merge "Add centos-extras repo to oraclelinux-base"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/base/oraclelinux-extras.repo | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 2b394b400..e22ecbe91 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -77,6 +77,7 @@ RUN yum install -y \ {% if base_distro == 'oraclelinux' %} +COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo RUN yum install -y \ yum-utils \ https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ diff --git a/docker/base/oraclelinux-extras.repo b/docker/base/oraclelinux-extras.repo new file mode 100644 index 000000000..7468bd6d3 --- /dev/null +++ b/docker/base/oraclelinux-extras.repo @@ -0,0 +1,6 @@ +[extras] +name=CentOS-$releasever - Extras +mirrorlist=http://mirrorlist.centos.org/?release=7&arch=$basearch&repo=extras&infra=$infra +#baseurl=http://mirror.centos.org/centos/7/extras/$basearch/ +gpgcheck=1 +gpgkey=http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-7 |