Explorar el Código

Merge pull request #14457 from Djelibeybi/oraclelinux-rpms

Add support for building docker-engine RPM on Oracle Linux 7.
Jessie Frazelle hace 10 años
padre
commit
0f9c458730
Se han modificado 2 ficheros con 27 adiciones y 1 borrados
  1. 12 1
      contrib/builder/rpm/generate.sh
  2. 15 0
      contrib/builder/rpm/oraclelinux-7/Dockerfile

+ 12 - 1
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"
 			;;
@@ -55,8 +59,15 @@ 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
 	)
+
+	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"

+ 15 - 0
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 -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
+ENV PATH $PATH:/usr/local/go/bin
+
+ENV AUTO_GOPATH 1
+ENV DOCKER_BUILDTAGS selinux