diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 830062555..e5a8ccd0e 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -43,7 +43,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.0.0 +ENV CONTAINERD_COMMIT=v1.0.1-rc.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 81b5e869b..ec81b02e0 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,10 +1,10 @@ -# linuxkit/alpine:9d29dc154440859d729ba864ffd67bb4c90e630d-arm64 +# linuxkit/alpine:7dedd0ef748530ece641d931b6f77aa2992d90e5-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.8.1-r2 +apk-tools-2.8.2-r0 argp-standalone-1.3-r2 attr-2.4.47-r6 attr-dev-2.4.47-r6 @@ -115,7 +115,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.2m-r0 +libcrypto1.0-1.0.2n-r0 libcurl-7.57.0-r0 libdrm-2.4.88-r0 libedit-20170329.3.1-r3 @@ -160,7 +160,7 @@ libseccomp-2.3.2-r0 libseccomp-dev-2.3.2-r0 libsmartcols-2.31-r0 libssh2-1.8.0-r2 -libssl1.0-1.0.2m-r0 +libssl1.0-1.0.2n-r0 libstdc++-6.4.0-r5 libtasn1-4.12-r2 libtirpc-1.0.1-r2 @@ -204,11 +204,11 @@ open-iscsi-2.0.874-r0 open-isns-lib-0.97-r2 openntpd-6.2_p3-r0 openrc-0.24.1-r4 -openssh-keygen-7.5_p1-r7 -openssh-server-7.5_p1-r7 -openssh-server-common-7.5_p1-r7 -openssl-1.0.2m-r0 -openssl-dev-1.0.2m-r0 +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 opus-1.2.1-r1 p11-kit-0.23.2-r2 patch-2.7.5-r1 @@ -234,7 +234,7 @@ qemu-system-x86_64-2.10.1-r2 readline-7.0.003-r0 rhash-libs-1.3.5-r1 rpcbind-0.2.4-r0 -rsync-3.1.2-r6 +rsync-3.1.2-r7 scanelf-1.2.2-r1 sed-4.4-r1 sfdisk-2.31-r0 @@ -266,7 +266,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.20171211-r0 +wireguard-tools-0.0.20171221-r0 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 7f037ed54..465a587a1 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,10 +1,10 @@ -# linuxkit/alpine:4584958639b2378246371fe219f33b270667e22e-amd64 +# linuxkit/alpine:99dec12a5e8524b7a262c6bdfcea733191354883-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.8.1-r2 +apk-tools-2.8.2-r0 argp-standalone-1.3-r2 attr-2.4.47-r6 attr-dev-2.4.47-r6 @@ -211,9 +211,9 @@ open-isns-lib-0.97-r2 open-vm-tools-10.1.15-r0 openntpd-6.2_p3-r0 openrc-0.24.1-r4 -openssh-keygen-7.5_p1-r7 -openssh-server-7.5_p1-r7 -openssh-server-common-7.5_p1-r7 +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 opus-1.2.1-r1 @@ -241,7 +241,7 @@ qemu-system-x86_64-2.10.1-r2 readline-7.0.003-r0 rhash-libs-1.3.5-r1 rpcbind-0.2.4-r0 -rsync-3.1.2-r6 +rsync-3.1.2-r7 scanelf-1.2.2-r1 sed-4.4-r1 sfdisk-2.31-r0 @@ -274,7 +274,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.20171211-r0 +wireguard-tools-0.0.20171221-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r8 xfsprogs-4.14.0-r0