Browse code
Dockerfile: use seccomp provided by stretch
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Akihiro Suda authored on 2017/09/25 19:03:37Showing 6 changed files
- Dockerfile
- Dockerfile.aarch64
- Dockerfile.armhf
- Dockerfile.ppc64le
- Dockerfile.s390x
- Dockerfile.simple
| ... | ... |
@@ -55,6 +55,7 @@ RUN apt-get update && apt-get install -y \ |
| 55 | 55 |
libnl-3-dev \ |
| 56 | 56 |
libprotobuf-c0-dev \ |
| 57 | 57 |
libprotobuf-dev \ |
| 58 |
+ libseccomp-dev \ |
|
| 58 | 59 |
libsystemd-dev \ |
| 59 | 60 |
libtool \ |
| 60 | 61 |
libudev-dev \ |
| ... | ... |
@@ -80,21 +81,6 @@ RUN apt-get update && apt-get install -y \ |
| 80 | 80 |
--no-install-recommends \ |
| 81 | 81 |
&& pip install awscli==1.10.15 |
| 82 | 82 |
|
| 83 |
-# Install seccomp: the version shipped upstream is too old |
|
| 84 |
-ENV SECCOMP_VERSION 2.3.2 |
|
| 85 |
-RUN set -x \ |
|
| 86 |
- && export SECCOMP_PATH="$(mktemp -d)" \ |
|
| 87 |
- && curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \
|
|
| 88 |
- | tar -xzC "$SECCOMP_PATH" --strip-components=1 \ |
|
| 89 |
- && ( \ |
|
| 90 |
- cd "$SECCOMP_PATH" \ |
|
| 91 |
- && ./configure --prefix=/usr/local \ |
|
| 92 |
- && make \ |
|
| 93 |
- && make install \ |
|
| 94 |
- && ldconfig \ |
|
| 95 |
- ) \ |
|
| 96 |
- && rm -rf "$SECCOMP_PATH" |
|
| 97 |
- |
|
| 98 | 83 |
# Install Go |
| 99 | 84 |
# IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines |
| 100 | 85 |
# will need updating, to avoid errors. Ping #docker-maintainers on IRC |
| ... | ... |
@@ -48,6 +48,7 @@ RUN apt-get update && apt-get install -y \ |
| 48 | 48 |
libnl-3-dev \ |
| 49 | 49 |
libprotobuf-c0-dev \ |
| 50 | 50 |
libprotobuf-dev \ |
| 51 |
+ libseccomp-dev \ |
|
| 51 | 52 |
libsystemd-dev \ |
| 52 | 53 |
libtool \ |
| 53 | 54 |
libudev-dev \ |
| ... | ... |
@@ -72,21 +73,6 @@ RUN apt-get update && apt-get install -y \ |
| 72 | 72 |
zip \ |
| 73 | 73 |
--no-install-recommends |
| 74 | 74 |
|
| 75 |
-# Install seccomp: the version shipped upstream is too old |
|
| 76 |
-ENV SECCOMP_VERSION 2.3.2 |
|
| 77 |
-RUN set -x \ |
|
| 78 |
- && export SECCOMP_PATH="$(mktemp -d)" \ |
|
| 79 |
- && curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \
|
|
| 80 |
- | tar -xzC "$SECCOMP_PATH" --strip-components=1 \ |
|
| 81 |
- && ( \ |
|
| 82 |
- cd "$SECCOMP_PATH" \ |
|
| 83 |
- && ./configure --prefix=/usr/local \ |
|
| 84 |
- && make \ |
|
| 85 |
- && make install \ |
|
| 86 |
- && ldconfig \ |
|
| 87 |
- ) \ |
|
| 88 |
- && rm -rf "$SECCOMP_PATH" |
|
| 89 |
- |
|
| 90 | 75 |
# Install Go |
| 91 | 76 |
# We don't have official binary golang 1.7.5 tarballs for ARM64, either for Go or |
| 92 | 77 |
# bootstrap, so we use Debian golang (1.7) as bootstrap to build Go from source code. |
| ... | ... |
@@ -40,6 +40,7 @@ RUN apt-get update && apt-get install -y \ |
| 40 | 40 |
libapparmor-dev \ |
| 41 | 41 |
libcap-dev \ |
| 42 | 42 |
libdevmapper-dev \ |
| 43 |
+ libseccomp-dev \ |
|
| 43 | 44 |
libsystemd-dev \ |
| 44 | 45 |
libtool \ |
| 45 | 46 |
libudev-dev \ |
| ... | ... |
@@ -72,21 +73,6 @@ ENV GOPATH /go |
| 72 | 72 |
ENV GOARCH arm |
| 73 | 73 |
ENV GOARM 7 |
| 74 | 74 |
|
| 75 |
-# Install seccomp: the version shipped upstream is too old |
|
| 76 |
-ENV SECCOMP_VERSION 2.3.2 |
|
| 77 |
-RUN set -x \ |
|
| 78 |
- && export SECCOMP_PATH="$(mktemp -d)" \ |
|
| 79 |
- && curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \
|
|
| 80 |
- | tar -xzC "$SECCOMP_PATH" --strip-components=1 \ |
|
| 81 |
- && ( \ |
|
| 82 |
- cd "$SECCOMP_PATH" \ |
|
| 83 |
- && ./configure --prefix=/usr/local \ |
|
| 84 |
- && make \ |
|
| 85 |
- && make install \ |
|
| 86 |
- && ldconfig \ |
|
| 87 |
- ) \ |
|
| 88 |
- && rm -rf "$SECCOMP_PATH" |
|
| 89 |
- |
|
| 90 | 75 |
# Install two versions of the registry. The first is an older version that |
| 91 | 76 |
# only supports schema1 manifests. The second is a newer version that supports |
| 92 | 77 |
# both. This allows integration-cli tests to cover push/pull with both schema1 |
| ... | ... |
@@ -41,6 +41,7 @@ RUN apt-get update && apt-get install -y \ |
| 41 | 41 |
libapparmor-dev \ |
| 42 | 42 |
libcap-dev \ |
| 43 | 43 |
libdevmapper-dev \ |
| 44 |
+ libseccomp-dev \ |
|
| 44 | 45 |
libsystemd-dev \ |
| 45 | 46 |
libtool \ |
| 46 | 47 |
libudev-dev \ |
| ... | ... |
@@ -60,22 +61,6 @@ RUN apt-get update && apt-get install -y \ |
| 60 | 60 |
vim-common \ |
| 61 | 61 |
--no-install-recommends |
| 62 | 62 |
|
| 63 |
-# Install seccomp: the version shipped upstream is too old |
|
| 64 |
-ENV SECCOMP_VERSION 2.3.2 |
|
| 65 |
-RUN set -x \ |
|
| 66 |
- && export SECCOMP_PATH="$(mktemp -d)" \ |
|
| 67 |
- && curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \
|
|
| 68 |
- | tar -xzC "$SECCOMP_PATH" --strip-components=1 \ |
|
| 69 |
- && ( \ |
|
| 70 |
- cd "$SECCOMP_PATH" \ |
|
| 71 |
- && ./configure --prefix=/usr/local \ |
|
| 72 |
- && make \ |
|
| 73 |
- && make install \ |
|
| 74 |
- && ldconfig \ |
|
| 75 |
- ) \ |
|
| 76 |
- && rm -rf "$SECCOMP_PATH" |
|
| 77 |
- |
|
| 78 |
- |
|
| 79 | 63 |
# Install Go |
| 80 | 64 |
# NOTE: official ppc64le go binaries weren't available until go 1.6.4 and 1.7.4 |
| 81 | 65 |
# IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored |
| ... | ... |
@@ -37,6 +37,7 @@ RUN apt-get update && apt-get install -y \ |
| 37 | 37 |
libapparmor-dev \ |
| 38 | 38 |
libcap-dev \ |
| 39 | 39 |
libdevmapper-dev \ |
| 40 |
+ libseccomp-dev \ |
|
| 40 | 41 |
libsystemd-dev \ |
| 41 | 42 |
libtool \ |
| 42 | 43 |
libudev-dev \ |
| ... | ... |
@@ -56,21 +57,6 @@ RUN apt-get update && apt-get install -y \ |
| 56 | 56 |
vim-common \ |
| 57 | 57 |
--no-install-recommends |
| 58 | 58 |
|
| 59 |
-# Install seccomp: the version shipped upstream is too old |
|
| 60 |
-ENV SECCOMP_VERSION 2.3.2 |
|
| 61 |
-RUN set -x \ |
|
| 62 |
- && export SECCOMP_PATH="$(mktemp -d)" \ |
|
| 63 |
- && curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \
|
|
| 64 |
- | tar -xzC "$SECCOMP_PATH" --strip-components=1 \ |
|
| 65 |
- && ( \ |
|
| 66 |
- cd "$SECCOMP_PATH" \ |
|
| 67 |
- && ./configure --prefix=/usr/local \ |
|
| 68 |
- && make \ |
|
| 69 |
- && make install \ |
|
| 70 |
- && ldconfig \ |
|
| 71 |
- ) \ |
|
| 72 |
- && rm -rf "$SECCOMP_PATH" |
|
| 73 |
- |
|
| 74 | 59 |
# IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored |
| 75 | 60 |
ENV GO_VERSION 1.8.3 |
| 76 | 61 |
RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" \
|
| ... | ... |
@@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ |
| 23 | 23 |
git \ |
| 24 | 24 |
libapparmor-dev \ |
| 25 | 25 |
libdevmapper-dev \ |
| 26 |
+ libseccomp-dev \ |
|
| 26 | 27 |
ca-certificates \ |
| 27 | 28 |
e2fsprogs \ |
| 28 | 29 |
iptables \ |
| ... | ... |
@@ -34,21 +35,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ |
| 34 | 34 |
vim-common \ |
| 35 | 35 |
&& rm -rf /var/lib/apt/lists/* |
| 36 | 36 |
|
| 37 |
-# Install seccomp: the version shipped upstream is too old |
|
| 38 |
-ENV SECCOMP_VERSION 2.3.2 |
|
| 39 |
-RUN set -x \ |
|
| 40 |
- && export SECCOMP_PATH="$(mktemp -d)" \ |
|
| 41 |
- && curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \
|
|
| 42 |
- | tar -xzC "$SECCOMP_PATH" --strip-components=1 \ |
|
| 43 |
- && ( \ |
|
| 44 |
- cd "$SECCOMP_PATH" \ |
|
| 45 |
- && ./configure --prefix=/usr/local \ |
|
| 46 |
- && make \ |
|
| 47 |
- && make install \ |
|
| 48 |
- && ldconfig \ |
|
| 49 |
- ) \ |
|
| 50 |
- && rm -rf "$SECCOMP_PATH" |
|
| 51 |
- |
|
| 52 | 37 |
# Install Go |
| 53 | 38 |
# IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines |
| 54 | 39 |
# will need updating, to avoid errors. Ping #docker-maintainers on IRC |