diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index d9888d02f..d91ffa1a9 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -54,7 +54,7 @@ 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.1.0-rc.2 +ENV CONTAINERD_COMMIT=v1.1.0 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git && \ diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index bf2ccc5f4..ca876eb80 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:e7546eaccb642adbc223d39ee7ca48d9b58dc2f1-arm64 +# linuxkit/alpine:14e0cf6d30dc39993ac7fb97439049e1cd69ccd5-arm64 # automatically generated list of installed packages abuild-3.1.0-r3 alpine-baselayout-3.0.5-r2 @@ -92,6 +92,7 @@ isl-0.18-r0 jansson-2.10-r0 jq-1.5-r4 json-c-0.12.1-r1 +keyutils-1.5.10-r0 keyutils-libs-1.5.10-r0 kmod-24-r0 krb5-conf-1.0-r1 @@ -268,7 +269,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.20180413-r3 +wireguard-tools-0.0.20180420-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 2403aa06b..5d1730be4 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,4 +1,4 @@ -# linuxkit/alpine:b3cb5e3adbf689ab5f500759d5ba774f279e3adf-s390x +# linuxkit/alpine:d91bd2b9c9f0303d520ad7249e23afeb7bdf9abc-s390x # automatically generated list of installed packages abuild-3.1.0-r3 alpine-baselayout-3.0.5-r2 @@ -91,6 +91,7 @@ isl-0.18-r0 jansson-2.10-r0 jq-1.5-r4 json-c-0.12.1-r1 +keyutils-1.5.10-r0 keyutils-libs-1.5.10-r0 kmod-24-r0 krb5-conf-1.0-r1 @@ -262,7 +263,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.20180413-r3 +wireguard-tools-0.0.20180420-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 1011990e2..7041cc8d1 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:02d7e748614512ea099e8c76254e41bcea03ba8f-amd64 +# linuxkit/alpine:90571a1a9059f3bf33ca3431bc5396aa837a47d3-amd64 # automatically generated list of installed packages abuild-3.1.0-r3 alpine-baselayout-3.0.5-r2 @@ -94,6 +94,7 @@ isl-0.18-r0 jansson-2.10-r0 jq-1.5-r4 json-c-0.12.1-r1 +keyutils-1.5.10-r0 keyutils-libs-1.5.10-r0 kmod-24-r0 krb5-conf-1.0-r1 @@ -276,7 +277,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.20180413-r3 +wireguard-tools-0.0.20180420-r3 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r8 xfsprogs-4.14.0-r0