From 6a4d0df63c94010d51af9efeff52d722d91392b4 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 16 Apr 2018 10:56:24 +0100 Subject: [PATCH] alpine: Bump to containerd v1.1.0-rc.2 Requires libseccomp-dev and the go1.10 package Signed-off-by: Ian Campbell --- tools/alpine/Dockerfile | 7 ++++--- tools/alpine/packages | 1 + tools/alpine/versions.aarch64 | 17 +++++++++-------- tools/alpine/versions.s390x | 9 +++++---- tools/alpine/versions.x86_64 | 9 +++++---- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index cee91e851..d9888d02f 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -43,7 +43,8 @@ RUN mv /etc/apk/repositories /etc/apk/repositories.upstream && echo "/mirror" > # add Go validation tools COPY go-compile.sh /go/bin/ -RUN apk add --no-cache git go musl-dev +# containerd v1.1.x requires go1.10 which is currently a separate package in Alpine 3.7 +RUN apk add --no-cache git go1.10 musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin RUN go get -u github.com/golang/lint/golint RUN go get -u github.com/gordonklaus/ineffassign @@ -53,13 +54,13 @@ RUN go get -u github.com/LK4D4/vndr # Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and # `test/pkg/containerd/Dockerfile` when changing this. ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -ENV CONTAINERD_COMMIT=v1.0.3 +ENV CONTAINERD_COMMIT=v1.1.0-rc.2 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git && \ cd $GOPATH/src/github.com/containerd/containerd && \ git checkout $CONTAINERD_COMMIT -RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make +RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make libseccomp-dev RUN cd $GOPATH/src/github.com/containerd/containerd && \ make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILD_TAGS="static_build" diff --git a/tools/alpine/packages b/tools/alpine/packages index 6d3ee1eab..5f1f92050 100644 --- a/tools/alpine/packages +++ b/tools/alpine/packages @@ -45,6 +45,7 @@ git gmp-dev gnupg go +go1.10 grep hvtools installkernel diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index 017b715ed..bf2ccc5f4 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,10 +1,10 @@ -# linuxkit/alpine:6d019c0ba6b9a9238b5c03ac8a85aecaac217711-arm64 +# linuxkit/alpine:e7546eaccb642adbc223d39ee7ca48d9b58dc2f1-arm64 # automatically generated list of installed packages abuild-3.1.0-r3 alpine-baselayout-3.0.5-r2 alpine-keys-2.1-r1 alsa-lib-1.1.4.1-r2 -apk-tools-2.9.1-r0 +apk-tools-2.9.1-r2 argp-standalone-1.3-r2 attr-2.4.47-r6 attr-dev-2.4.47-r6 @@ -77,6 +77,7 @@ gmp-dev-6.1.2-r1 gnupg-2.2.3-r0 gnutls-3.6.1-r0 go-1.9.4-r0 +go1.10-1.10-r0 grep-3.1-r0 guile-2.0.14-r0 guile-libs-2.0.14-r0 @@ -115,7 +116,7 @@ libcap-2.25-r1 libcap-ng-0.7.8-r1 libcap-ng-dev-0.7.8-r1 libcom_err-1.43.7-r0 -libcrypto1.0-1.0.2n-r0 +libcrypto1.0-1.0.2o-r0 libcurl-7.59.0-r0 libdrm-2.4.88-r0 libedit-20170329.3.1-r3 @@ -160,7 +161,7 @@ libseccomp-2.3.2-r1 libseccomp-dev-2.3.2-r1 libsmartcols-2.31-r0 libssh2-1.8.0-r2 -libssl1.0-1.0.2n-r0 +libssl1.0-1.0.2o-r0 libstdc++-6.4.0-r5 libtasn1-4.12-r3 libtirpc-1.0.1-r2 @@ -207,8 +208,8 @@ openrc-0.24.1-r4 openssh-keygen-7.5_p1-r8 openssh-server-7.5_p1-r8 openssh-server-common-7.5_p1-r8 -openssl-1.0.2n-r0 -openssl-dev-1.0.2n-r0 +openssl-1.0.2o-r0 +openssl-dev-1.0.2o-r0 opus-1.2.1-r1 p11-kit-0.23.2-r2 patch-2.7.5-r2 @@ -216,7 +217,7 @@ pax-utils-1.2.2-r1 pcre-8.41-r1 pcre2-10.30-r0 pcsc-lite-libs-1.8.22-r0 -perl-5.26.1-r1 +perl-5.26.2-r0 pigz-2.3.4-r2 pinentry-1.0.0-r0 pixman-0.34.0-r3 @@ -267,7 +268,7 @@ vim-8.0.1359-r0 wayland-libs-client-1.14.0-r2 wayland-libs-cursor-1.14.0-r2 wayland-libs-server-1.14.0-r2 -wireguard-tools-0.0.20180304-r2 +wireguard-tools-0.0.20180413-r3 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r8 xfsprogs-4.14.0-r0 diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x index 207d8dd39..2403aa06b 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,10 +1,10 @@ -# linuxkit/alpine:0c1aa378a52a20b52a091f6b2cc345e01cc79271-s390x +# linuxkit/alpine:b3cb5e3adbf689ab5f500759d5ba774f279e3adf-s390x # automatically generated list of installed packages abuild-3.1.0-r3 alpine-baselayout-3.0.5-r2 alpine-keys-2.1-r1 alsa-lib-1.1.4.1-r2 -apk-tools-2.9.1-r0 +apk-tools-2.9.1-r2 argp-standalone-1.3-r2 attr-2.4.47-r6 attr-dev-2.4.47-r6 @@ -77,6 +77,7 @@ gmp-dev-6.1.2-r1 gnupg-2.2.3-r0 gnutls-3.6.1-r0 go-1.9.4-r0 +go1.10-1.10-r0 grep-3.1-r0 guile-2.0.14-r0 guile-libs-2.0.14-r0 @@ -210,7 +211,7 @@ pax-utils-1.2.2-r1 pcre-8.41-r1 pcre2-10.30-r0 pcsc-lite-libs-1.8.22-r0 -perl-5.26.1-r1 +perl-5.26.2-r0 pigz-2.3.4-r2 pinentry-1.0.0-r0 pixman-0.34.0-r3 @@ -261,7 +262,7 @@ vim-8.0.1359-r0 wayland-libs-client-1.14.0-r2 wayland-libs-cursor-1.14.0-r2 wayland-libs-server-1.14.0-r2 -wireguard-tools-0.0.20180304-r2 +wireguard-tools-0.0.20180413-r3 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r8 xfsprogs-4.14.0-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 1d4b8e004..1011990e2 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,10 +1,10 @@ -# linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7-amd64 +# linuxkit/alpine:02d7e748614512ea099e8c76254e41bcea03ba8f-amd64 # automatically generated list of installed packages abuild-3.1.0-r3 alpine-baselayout-3.0.5-r2 alpine-keys-2.1-r1 alsa-lib-1.1.4.1-r2 -apk-tools-2.9.1-r0 +apk-tools-2.9.1-r2 argp-standalone-1.3-r2 attr-2.4.47-r6 attr-dev-2.4.47-r6 @@ -78,6 +78,7 @@ gmp-dev-6.1.2-r1 gnupg-2.2.3-r0 gnutls-3.6.1-r0 go-1.9.4-r0 +go1.10-1.10-r0 grep-3.1-r0 guile-2.0.14-r0 guile-libs-2.0.14-r0 @@ -224,7 +225,7 @@ pax-utils-1.2.2-r1 pcre-8.41-r1 pcre2-10.30-r0 pcsc-lite-libs-1.8.22-r0 -perl-5.26.1-r1 +perl-5.26.2-r0 pigz-2.3.4-r2 pinentry-1.0.0-r0 pixman-0.34.0-r3 @@ -275,7 +276,7 @@ vim-8.0.1359-r0 wayland-libs-client-1.14.0-r2 wayland-libs-cursor-1.14.0-r2 wayland-libs-server-1.14.0-r2 -wireguard-tools-0.0.20180304-r2 +wireguard-tools-0.0.20180413-r3 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r8 xfsprogs-4.14.0-r0