From 1b51a05375b48c5f655fbbedc5a1e7cba044122c Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Mon, 25 Sep 2017 10:03:37 +0000 Subject: [PATCH] Dockerfile: use seccomp provided by stretch Signed-off-by: Akihiro Suda --- Dockerfile | 16 +--------------- Dockerfile.aarch64 | 16 +--------------- Dockerfile.armhf | 16 +--------------- Dockerfile.ppc64le | 17 +---------------- Dockerfile.s390x | 16 +--------------- Dockerfile.simple | 16 +--------------- 6 files changed, 6 insertions(+), 91 deletions(-) diff --git a/Dockerfile b/Dockerfile index 82375a78ef..3d153b6b0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,6 +55,7 @@ RUN apt-get update && apt-get install -y \ libnl-3-dev \ libprotobuf-c0-dev \ libprotobuf-dev \ + libseccomp-dev \ libsystemd-dev \ libtool \ libudev-dev \ @@ -80,21 +81,6 @@ RUN apt-get update && apt-get install -y \ --no-install-recommends \ && pip install awscli==1.10.15 -# Install seccomp: the version shipped upstream is too old -ENV SECCOMP_VERSION 2.3.2 -RUN set -x \ - && export SECCOMP_PATH="$(mktemp -d)" \ - && curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \ - | tar -xzC "$SECCOMP_PATH" --strip-components=1 \ - && ( \ - cd "$SECCOMP_PATH" \ - && ./configure --prefix=/usr/local \ - && make \ - && make install \ - && ldconfig \ - ) \ - && rm -rf "$SECCOMP_PATH" - # Install Go # IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines # will need updating, to avoid errors. Ping #docker-maintainers on IRC diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 493145174d..8396d57ab3 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -48,6 +48,7 @@ RUN apt-get update && apt-get install -y \ libnl-3-dev \ libprotobuf-c0-dev \ libprotobuf-dev \ + libseccomp-dev \ libsystemd-dev \ libtool \ libudev-dev \ @@ -72,21 +73,6 @@ RUN apt-get update && apt-get install -y \ zip \ --no-install-recommends -# Install seccomp: the version shipped upstream is too old -ENV SECCOMP_VERSION 2.3.2 -RUN set -x \ - && export SECCOMP_PATH="$(mktemp -d)" \ - && curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \ - | tar -xzC "$SECCOMP_PATH" --strip-components=1 \ - && ( \ - cd "$SECCOMP_PATH" \ - && ./configure --prefix=/usr/local \ - && make \ - && make install \ - && ldconfig \ - ) \ - && rm -rf "$SECCOMP_PATH" - # Install Go # We don't have official binary golang 1.7.5 tarballs for ARM64, either for Go or # bootstrap, so we use Debian golang (1.7) as bootstrap to build Go from source code. diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 9818c34cc8..5cd257a170 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -40,6 +40,7 @@ RUN apt-get update && apt-get install -y \ libapparmor-dev \ libcap-dev \ libdevmapper-dev \ + libseccomp-dev \ libsystemd-dev \ libtool \ libudev-dev \ @@ -72,21 +73,6 @@ ENV GOPATH /go ENV GOARCH arm ENV GOARM 7 -# Install seccomp: the version shipped upstream is too old -ENV SECCOMP_VERSION 2.3.2 -RUN set -x \ - && export SECCOMP_PATH="$(mktemp -d)" \ - && curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \ - | tar -xzC "$SECCOMP_PATH" --strip-components=1 \ - && ( \ - cd "$SECCOMP_PATH" \ - && ./configure --prefix=/usr/local \ - && make \ - && make install \ - && ldconfig \ - ) \ - && rm -rf "$SECCOMP_PATH" - # Install two versions of the registry. The first is an older version that # only supports schema1 manifests. The second is a newer version that supports # both. This allows integration-cli tests to cover push/pull with both schema1 diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index 91d2bd2476..5aca09a420 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -41,6 +41,7 @@ RUN apt-get update && apt-get install -y \ libapparmor-dev \ libcap-dev \ libdevmapper-dev \ + libseccomp-dev \ libsystemd-dev \ libtool \ libudev-dev \ @@ -60,22 +61,6 @@ RUN apt-get update && apt-get install -y \ vim-common \ --no-install-recommends -# Install seccomp: the version shipped upstream is too old -ENV SECCOMP_VERSION 2.3.2 -RUN set -x \ - && export SECCOMP_PATH="$(mktemp -d)" \ - && curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \ - | tar -xzC "$SECCOMP_PATH" --strip-components=1 \ - && ( \ - cd "$SECCOMP_PATH" \ - && ./configure --prefix=/usr/local \ - && make \ - && make install \ - && ldconfig \ - ) \ - && rm -rf "$SECCOMP_PATH" - - # Install Go # NOTE: official ppc64le go binaries weren't available until go 1.6.4 and 1.7.4 # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored diff --git a/Dockerfile.s390x b/Dockerfile.s390x index 9ad5d5aa59..32712caca3 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -37,6 +37,7 @@ RUN apt-get update && apt-get install -y \ libapparmor-dev \ libcap-dev \ libdevmapper-dev \ + libseccomp-dev \ libsystemd-dev \ libtool \ libudev-dev \ @@ -56,21 +57,6 @@ RUN apt-get update && apt-get install -y \ vim-common \ --no-install-recommends -# Install seccomp: the version shipped upstream is too old -ENV SECCOMP_VERSION 2.3.2 -RUN set -x \ - && export SECCOMP_PATH="$(mktemp -d)" \ - && curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \ - | tar -xzC "$SECCOMP_PATH" --strip-components=1 \ - && ( \ - cd "$SECCOMP_PATH" \ - && ./configure --prefix=/usr/local \ - && make \ - && make install \ - && ldconfig \ - ) \ - && rm -rf "$SECCOMP_PATH" - # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored ENV GO_VERSION 1.8.3 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" \ diff --git a/Dockerfile.simple b/Dockerfile.simple index cdbc242a75..5995093711 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ git \ libapparmor-dev \ libdevmapper-dev \ + libseccomp-dev \ ca-certificates \ e2fsprogs \ iptables \ @@ -34,21 +35,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ vim-common \ && rm -rf /var/lib/apt/lists/* -# Install seccomp: the version shipped upstream is too old -ENV SECCOMP_VERSION 2.3.2 -RUN set -x \ - && export SECCOMP_PATH="$(mktemp -d)" \ - && curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \ - | tar -xzC "$SECCOMP_PATH" --strip-components=1 \ - && ( \ - cd "$SECCOMP_PATH" \ - && ./configure --prefix=/usr/local \ - && make \ - && make install \ - && ldconfig \ - ) \ - && rm -rf "$SECCOMP_PATH" - # Install Go # IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines # will need updating, to avoid errors. Ping #docker-maintainers on IRC