From 414a1012718e6539f4bd2417a8138db7e2187b2b Mon Sep 17 00:00:00 2001
From: Avi Miller <avi.miller@oracle.com>
Date: Wed, 8 Jul 2015 16:12:19 +1000
Subject: [PATCH 1/2] Add support for building docker-engine RPM on Oracle
 Linux 7.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 0117330ae7da7dc77d27c551fb298d842afc3890
Component: engine
---
 components/engine/contrib/builder/rpm/generate.sh | 10 +++++++++-
 .../contrib/builder/rpm/oraclelinux-7/Dockerfile  | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 components/engine/contrib/builder/rpm/oraclelinux-7/Dockerfile

diff --git a/components/engine/contrib/builder/rpm/generate.sh b/components/engine/contrib/builder/rpm/generate.sh
index 5a5748bf91..804feb5d6d 100755
--- a/components/engine/contrib/builder/rpm/generate.sh
+++ b/components/engine/contrib/builder/rpm/generate.sh
@@ -43,6 +43,10 @@ for version in "${versions[@]}"; do
 				echo 'RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs' >> "$version/Dockerfile"
 			fi
 			;;
+		oraclelinux:*)
+			# get "Development Tools" packages and dependencies
+			echo 'RUN yum groupinstall -y "Development Tools"' >> "$version/Dockerfile"
+			;;
 		*)
 			echo 'RUN yum install -y @development-tools fedora-packager' >> "$version/Dockerfile"
 			;;
@@ -57,7 +61,11 @@ for version in "${versions[@]}"; do
 		sqlite-devel # for "sqlite3.h"
 		tar # older versions of dev-tools don't have tar
 	)
-	echo "RUN yum install -y ${packages[*]}" >> "$version/Dockerfile"
+	if [ "$from" == "oraclelinux:7" ]; then
+		echo "RUN yum install --enablerepo=ol7_optional_latest -y ${packages[*]}" >> "$version/Dockerfile"
+	else
+		echo "RUN yum install -y ${packages[*]}" >> "$version/Dockerfile"
+	fi
 
 	echo >> "$version/Dockerfile"
 
diff --git a/components/engine/contrib/builder/rpm/oraclelinux-7/Dockerfile b/components/engine/contrib/builder/rpm/oraclelinux-7/Dockerfile
new file mode 100644
index 0000000000..228fdd8ac8
--- /dev/null
+++ b/components/engine/contrib/builder/rpm/oraclelinux-7/Dockerfile
@@ -0,0 +1,15 @@
+#
+# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/generate.sh"!
+#
+
+FROM oraclelinux:7
+
+RUN yum groupinstall -y "Development Tools"
+RUN yum install --enablerepo=ol7_optional_latest -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel sqlite-devel tar
+
+ENV GO_VERSION 1.4.2
+RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
+ENV PATH $PATH:/usr/local/go/bin
+
+ENV AUTO_GOPATH 1
+ENV DOCKER_BUILDTAGS selinux

From 68020cd75e4ae672ce7860d9a5d9b34a9b643301 Mon Sep 17 00:00:00 2001
From: Avi Miller <avi.miller@oracle.com>
Date: Fri, 10 Jul 2015 07:34:39 +1000
Subject: [PATCH 2/2] Change generate.sh so that the yum command for packages
 remains generic across distros.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: f18c4f23cc98ba4fd4fb3241571ce31062eda717
Component: engine
---
 components/engine/contrib/builder/rpm/generate.sh | 15 +++++++++------
 .../contrib/builder/rpm/oraclelinux-7/Dockerfile  |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/components/engine/contrib/builder/rpm/generate.sh b/components/engine/contrib/builder/rpm/generate.sh
index 804feb5d6d..542c9d85f1 100755
--- a/components/engine/contrib/builder/rpm/generate.sh
+++ b/components/engine/contrib/builder/rpm/generate.sh
@@ -59,13 +59,16 @@ for version in "${versions[@]}"; do
 		glibc-static
 		libselinux-devel # for "libselinux.so"
 		sqlite-devel # for "sqlite3.h"
-		tar # older versions of dev-tools don't have tar
+		tar # older versions of dev-tools do not have tar
 	)
-	if [ "$from" == "oraclelinux:7" ]; then
-		echo "RUN yum install --enablerepo=ol7_optional_latest -y ${packages[*]}" >> "$version/Dockerfile"
-	else
-		echo "RUN yum install -y ${packages[*]}" >> "$version/Dockerfile"
-	fi
+
+	case "$from" in
+		oraclelinux:7)
+			# Enable the optional repository
+			packages=( --enablerepo=ol7_optional_latest "${packages[*]}" )
+			;;
+	esac
+	echo "RUN yum install -y ${packages[*]}" >> "$version/Dockerfile"
 
 	echo >> "$version/Dockerfile"
 
diff --git a/components/engine/contrib/builder/rpm/oraclelinux-7/Dockerfile b/components/engine/contrib/builder/rpm/oraclelinux-7/Dockerfile
index 228fdd8ac8..333a9f1f33 100644
--- a/components/engine/contrib/builder/rpm/oraclelinux-7/Dockerfile
+++ b/components/engine/contrib/builder/rpm/oraclelinux-7/Dockerfile
@@ -5,7 +5,7 @@
 FROM oraclelinux:7
 
 RUN yum groupinstall -y "Development Tools"
-RUN yum install --enablerepo=ol7_optional_latest -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel sqlite-devel tar
+RUN yum install -y --enablerepo=ol7_optional_latest btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel sqlite-devel tar
 
 ENV GO_VERSION 1.4.2
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local