diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 426f9df07..793cad560 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -56,7 +56,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.2.4 +ENV CONTAINERD_COMMIT=v1.2.5 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 209456d5d..aa7d1b5a2 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,6 +1,6 @@ -# linuxkit/alpine:e6dcfd363a0c17f550f515071b57c7008522ed61-arm64 +# linuxkit/alpine:f20fe82103e63ff4ad69d3936515e1eda414405f-arm64 # automatically generated list of installed packages -abuild-3.3.0-r1 +abuild-3.3.1-r0 alpine-baselayout-3.1.0-r3 alpine-keys-2.1-r1 apk-tools-2.10.3-r1 @@ -233,9 +233,9 @@ open-isns-lib-0.97-r4 openntpd-6.2_p3-r2 openrc-0.39.2-r3 openresolv-3.9.0-r0 -openssh-keygen-7.9_p1-r2 -openssh-server-7.9_p1-r2 -openssh-server-common-7.9_p1-r2 +openssh-keygen-7.9_p1-r4 +openssh-server-7.9_p1-r4 +openssh-server-common-7.9_p1-r4 openssl-1.1.1a-r1 openssl-dev-1.1.1a-r1 opus-1.3-r0 diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x index afc3cd57d..bdf4a6cae 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,6 +1,6 @@ -# linuxkit/alpine:8fe0884e721d9810a79d0bf467d49efffce3c7c5-s390x +# linuxkit/alpine:4703ded9a2e82b8963b5f5a982e4ba49efe88628-s390x # automatically generated list of installed packages -abuild-3.3.0-r1 +abuild-3.3.1-r0 alpine-baselayout-3.1.0-r3 alpine-keys-2.1-r1 apk-tools-2.10.3-r1 @@ -227,9 +227,9 @@ open-isns-lib-0.97-r4 openntpd-6.2_p3-r2 openrc-0.39.2-r3 openresolv-3.9.0-r0 -openssh-keygen-7.9_p1-r2 -openssh-server-7.9_p1-r2 -openssh-server-common-7.9_p1-r2 +openssh-keygen-7.9_p1-r4 +openssh-server-7.9_p1-r4 +openssh-server-common-7.9_p1-r4 openssl-1.1.1a-r1 openssl-dev-1.1.1a-r1 opus-1.3-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 165c303b4..ce6dadb09 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,6 +1,6 @@ -# linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed-amd64 +# linuxkit/alpine:6ed32ba2b29a12b3d75f3d5b9be1b4ac00e7d479-amd64 # automatically generated list of installed packages -abuild-3.3.0-r1 +abuild-3.3.1-r0 alpine-baselayout-3.1.0-r3 alpine-keys-2.1-r1 apk-tools-2.10.3-r1 @@ -244,9 +244,9 @@ open-vm-tools-openrc-10.3.5-r1 openntpd-6.2_p3-r2 openrc-0.39.2-r3 openresolv-3.9.0-r0 -openssh-keygen-7.9_p1-r2 -openssh-server-7.9_p1-r2 -openssh-server-common-7.9_p1-r2 +openssh-keygen-7.9_p1-r4 +openssh-server-7.9_p1-r4 +openssh-server-common-7.9_p1-r4 openssl-1.1.1a-r1 openssl-dev-1.1.1a-r1 opus-1.3-r0