From a1ed21a63b726e4bade7f6f0a4e804a940558b42 Mon Sep 17 00:00:00 2001 From: Iliana Weller Date: Wed, 8 Feb 2017 21:24:55 +0000 Subject: [PATCH] Build the docker-engine RPM for Amazon Linux Signed-off-by: Iliana Weller Upstream-commit: 0b0216b67bc4721bf1baad139577c10342b8252c Component: engine --- .../rpm/amd64/amazonlinux-latest/Dockerfile | 18 ++++++++++++++++++ .../contrib/builder/rpm/amd64/generate.sh | 4 ++-- .../hack/make/.build-rpm/docker-engine.spec | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 components/engine/contrib/builder/rpm/amd64/amazonlinux-latest/Dockerfile diff --git a/components/engine/contrib/builder/rpm/amd64/amazonlinux-latest/Dockerfile b/components/engine/contrib/builder/rpm/amd64/amazonlinux-latest/Dockerfile new file mode 100644 index 0000000000..348ddbaa58 --- /dev/null +++ b/components/engine/contrib/builder/rpm/amd64/amazonlinux-latest/Dockerfile @@ -0,0 +1,18 @@ +# +# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"! +# + +FROM amazonlinux:latest + +RUN yum groupinstall -y "Development Tools" +RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel tar git cmake vim-common + +ENV GO_VERSION 1.7.5 +RUN curl -fSL "https://golang.org/dl/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 pkcs11 seccomp selinux +ENV RUNC_BUILDTAGS seccomp selinux + diff --git a/components/engine/contrib/builder/rpm/amd64/generate.sh b/components/engine/contrib/builder/rpm/amd64/generate.sh index 2973fa71ab..9c0db5a461 100755 --- a/components/engine/contrib/builder/rpm/amd64/generate.sh +++ b/components/engine/contrib/builder/rpm/amd64/generate.sh @@ -60,7 +60,7 @@ for version in "${versions[@]}"; do esac case "$from" in - centos:*) + centos:*|amazonlinux:latest) # get "Development Tools" packages dependencies echo 'RUN yum groupinstall -y "Development Tools"' >> "$version/Dockerfile" @@ -110,7 +110,7 @@ for version in "${versions[@]}"; do esac case "$from" in - oraclelinux:6) + oraclelinux:6|amazonlinux:latest) # doesn't use systemd, doesn't have a devel package for it packages=( "${packages[@]/systemd-devel}" ) ;; diff --git a/components/engine/hack/make/.build-rpm/docker-engine.spec b/components/engine/hack/make/.build-rpm/docker-engine.spec index d53e55b6c9..99a7db62e3 100644 --- a/components/engine/hack/make/.build-rpm/docker-engine.spec +++ b/components/engine/hack/make/.build-rpm/docker-engine.spec @@ -51,7 +51,7 @@ Requires: libcgroup1 %endif Requires: tar Requires: xz -%if 0%{?fedora} >= 21 || 0%{?centos} >= 7 || 0%{?rhel} >= 7 || 0%{?oraclelinux} >= 7 +%if 0%{?fedora} >= 21 || 0%{?centos} >= 7 || 0%{?rhel} >= 7 || 0%{?oraclelinux} >= 7 || 0%{?amzn} >= 1 # Resolves: rhbz#1165615 Requires: device-mapper-libs >= 1.02.90-1 %endif