From 865d3a148875485a3749be83b67ea7449830e6b6 Mon Sep 17 00:00:00 2001 From: Avi Miller <avi.miller@oracle.com> Date: Sat, 11 Jul 2015 09:53:00 +1000 Subject: [PATCH] Updated docker-engine.spec to build on Oracle Linux 6. Signed-off-by: Avi Miller <avi.miller@oracle.com> --- contrib/builder/rpm/oraclelinux-6/Dockerfile | 15 +++++++++++++++ hack/make/.build-rpm/docker-engine.spec | 5 +++++ 2 files changed, 20 insertions(+) create mode 100644 contrib/builder/rpm/oraclelinux-6/Dockerfile diff --git a/contrib/builder/rpm/oraclelinux-6/Dockerfile b/contrib/builder/rpm/oraclelinux-6/Dockerfile new file mode 100644 index 0000000000..4c96b5dd2d --- /dev/null +++ b/contrib/builder/rpm/oraclelinux-6/Dockerfile @@ -0,0 +1,15 @@ +# +# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/generate.sh"! +# + +FROM oraclelinux:6 + +RUN yum groupinstall -y "Development Tools" +RUN yum install -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 diff --git a/hack/make/.build-rpm/docker-engine.spec b/hack/make/.build-rpm/docker-engine.spec index 1c54ce0518..477afb419e 100644 --- a/hack/make/.build-rpm/docker-engine.spec +++ b/hack/make/.build-rpm/docker-engine.spec @@ -47,6 +47,11 @@ Requires: xz # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 %endif +%if 0%{?oraclelinux} == 6 +# Require Oracle Unbreakable Enterprise Kernel R3 and newer device-mapper +Requires: kernel-uek >= 3.8 +Requires: device-mapper >= 1.02.90-2 +%endif # conflicting packages Conflicts: docker