From 0117330ae7da7dc77d27c551fb298d842afc3890 Mon Sep 17 00:00:00 2001 From: Avi Miller Date: Wed, 8 Jul 2015 16:12:19 +1000 Subject: [PATCH] Add support for building docker-engine RPM on Oracle Linux 7. Signed-off-by: Avi Miller --- contrib/builder/rpm/generate.sh | 10 +++++++++- contrib/builder/rpm/oraclelinux-7/Dockerfile | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 contrib/builder/rpm/oraclelinux-7/Dockerfile diff --git a/contrib/builder/rpm/generate.sh b/contrib/builder/rpm/generate.sh index 5a5748bf91..804feb5d6d 100755 --- a/contrib/builder/rpm/generate.sh +++ b/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/contrib/builder/rpm/oraclelinux-7/Dockerfile b/contrib/builder/rpm/oraclelinux-7/Dockerfile new file mode 100644 index 0000000000..228fdd8ac8 --- /dev/null +++ b/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