diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-03-09 15:31:58 +0000 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2016-03-09 17:14:55 +0000 |
| commit | 2967f250d706496ad6d724e560868cf4e5aee777 (patch) | |
| tree | dfe5675caa1318e6a5441023b6c848b5b5f87aab | |
| parent | 241913cc8f0870b160c4cb1c3327022e0ad9dd4b (diff) | |
| download | kolla-2967f250d706496ad6d724e560868cf4e5aee777.tar.gz kolla-2967f250d706496ad6d724e560868cf4e5aee777.zip | |
Add centos-extras repo to oraclelinux-base
magnum requires python-docker-py which is missing in the oraclelinux
base repos.
TrivialFix
Change-Id: I466a170a8df8f207c47d06ba5a6cba9b7efa3e5f
| -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 |