From 2967f250d706496ad6d724e560868cf4e5aee777 Mon Sep 17 00:00:00 2001
From: Paul Bourke <paul.bourke@oracle.com>
Date: Wed, 9 Mar 2016 15:31:58 +0000
Subject: [PATCH] Add centos-extras repo to oraclelinux-base
magnum requires python-docker-py which is missing in the oraclelinux
base repos.
TrivialFix
Change-Id: I466a170a8df8f207c47d06ba5a6cba9b7efa3e5f
---
docker/base/Dockerfile.j2 | 1 +
docker/base/oraclelinux-extras.repo | 6 ++++++
2 files changed, 7 insertions(+)
create mode 100644 docker/base/oraclelinux-extras.repo
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 2b394b4005..e22ecbe916 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 0000000000..7468bd6d37
--- /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