alpine: Bump to containerd v1.2.2

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2019-01-08 11:17:23 +00:00
parent c52e20a932
commit b4187fe6ea
4 changed files with 78 additions and 77 deletions

View File

@ -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.2.0
ENV CONTAINERD_COMMIT=v1.2.2
RUN mkdir -p $GOPATH/src/github.com/containerd && \
cd $GOPATH/src/github.com/containerd && \
git clone https://github.com/containerd/containerd.git && \

View File

@ -1,4 +1,4 @@
# linuxkit/alpine:045a5aaa5b0b373f00048fbc19e5be78fb676a68-arm64
# linuxkit/alpine:ee9fdc5147feab0152bfcd767d8f9f534163b6fe-arm64
# automatically generated list of installed packages
abuild-3.2.0-r0
alpine-baselayout-3.1.0-r0
@ -24,7 +24,7 @@ btrfs-progs-4.17-r1
btrfs-progs-dev-4.17-r1
btrfs-progs-libs-4.17-r1
build-base-0.5-r1
busybox-1.28.4-r1
busybox-1.28.4-r3
busybox-initscripts-3.1-r3
bzip2-1.0.6-r6
ca-certificates-20171114-r3
@ -40,7 +40,7 @@ cmake-bash-completion-3.11.1-r2
coreutils-8.29-r2
cryptsetup-2.0.2-r3
cryptsetup-libs-2.0.2-r3
curl-7.61.1-r0
curl-7.61.1-r1
db-5.3.28-r0
dbus-libs-1.10.24-r1
device-mapper-libs-2.02.178-r0
@ -71,21 +71,21 @@ flex-libs-2.6.4-r1
fortify-headers-0.9-r0
fts-1.2.7-r1
fts-dev-1.2.7-r1
g++-6.4.0-r8
g++-6.4.0-r9
gc-7.6.4-r2
gcc-6.4.0-r8
gcc-6.4.0-r9
gdbm-1.13-r1
gettext-0.19.8.1-r2
gettext-asprintf-0.19.8.1-r2
gettext-dev-0.19.8.1-r2
gettext-libs-0.19.8.1-r2
git-2.18.0-r0
git-2.18.1-r0
glib-2.56.1-r0
gmp-6.1.2-r1
gmp-dev-6.1.2-r1
gnupg-2.2.8-r0
gnutls-3.6.2-r0
go-1.10.1-r0
go-1.10.7-r0
grep-3.1-r2
guile-2.0.14-r0
guile-libs-2.0.14-r0
@ -105,15 +105,15 @@ keyutils-libs-1.5.10-r0
kmod-24-r1
kmod-openrc-24-r1
krb5-conf-1.0-r1
krb5-dev-1.15.3-r0
krb5-libs-1.15.3-r0
krb5-server-ldap-1.15.3-r0
krb5-dev-1.15.4-r0
krb5-libs-1.15.4-r0
krb5-server-ldap-1.15.4-r0
libacl-2.2.52-r5
libaio-0.3.111-r0
libarchive-3.3.2-r3
libarchive-tools-3.3.2-r3
libassuan-2.5.1-r0
libatomic-6.4.0-r8
libatomic-6.4.0-r9
libatomic_ops-7.6.4-r0
libattr-2.4.47-r7
libblkid-2.32-r0
@ -127,8 +127,8 @@ libcap-2.25-r1
libcap-ng-0.7.9-r0
libcap-ng-dev-0.7.9-r0
libcom_err-1.44.2-r0
libcrypto1.0-1.0.2p-r0
libcurl-7.61.1-r0
libcrypto1.0-1.0.2q-r0
libcurl-7.61.1-r1
libdrm-2.4.92-r0
libedit-20170329.3.1-r3
libedit-dev-20170329.3.1-r3
@ -140,10 +140,10 @@ libexecinfo-1.1-r0
libexecinfo-dev-1.1-r0
libfdisk-2.32-r0
libffi-3.2.1-r4
libgcc-6.4.0-r8
libgcc-6.4.0-r9
libgcrypt-1.8.3-r0
libgmpxx-6.1.2-r1
libgomp-6.4.0-r8
libgomp-6.4.0-r9
libgpg-error-1.30-r0
libintl-0.19.8.1-r2
libisoburn-1.4.8-r0
@ -155,6 +155,7 @@ libltdl-2.4.6-r5
libmagic-5.32-r0
libmnl-1.0.4-r0
libmount-2.32-r0
libnfsidmap-2.3.1-r4
libnftnl-libs-1.1.1-r0
libnl-1.1.4-r0
libnl3-3.2.28-r1
@ -166,13 +167,13 @@ libressl-dev-2.7.4-r0
libressl2.7-libcrypto-2.7.4-r0
libressl2.7-libssl-2.7.4-r0
libressl2.7-libtls-2.7.4-r0
libsasl-2.1.26-r13
libsasl-2.1.26-r14
libseccomp-2.3.3-r1
libseccomp-dev-2.3.3-r1
libsmartcols-2.32-r0
libssh2-1.8.0-r3
libssl1.0-1.0.2p-r0
libstdc++-6.4.0-r8
libssl1.0-1.0.2q-r0
libstdc++-6.4.0-r9
libtasn1-4.13-r0
libtirpc-1.0.3-r0
libtirpc-dev-1.0.3-r0
@ -184,19 +185,19 @@ libusb-1.0.22-r0
libuuid-2.32-r0
libuv-1.20.2-r0
libverto-0.3.0-r1
libwbclient-4.8.4-r0
libwbclient-4.8.8-r0
libxau-1.0.8-r2
libxcb-1.13-r2
libxdmcp-1.1.2-r4
libxkbcommon-0.7.1-r1
libxml2-2.9.8-r0
libxml2-2.9.8-r1
linux-headers-4.4.6-r2
llvm5-5.0.1-r4
llvm5-dev-5.0.1-r4
llvm5-libs-5.0.1-r4
llvm5-static-5.0.1-r4
lsscsi-0.28-r0
lua5.3-libs-5.3.4-r5
lua5.3-libs-5.3.5-r1
luajit-2.1.0_beta3-r4
luajit-dev-2.1.0_beta3-r4
lz4-libs-1.8.2-r0
@ -219,20 +220,20 @@ ncurses-libs-6.1_p20180818-r1
ncurses-terminfo-6.1_p20180818-r1
ncurses-terminfo-base-6.1_p20180818-r1
nettle-3.4-r1
nfs-utils-2.3.1-r3
nfs-utils-openrc-2.3.1-r3
nfs-utils-2.3.1-r4
nfs-utils-openrc-2.3.1-r4
nghttp2-libs-1.32.0-r0
npth-1.5-r1
oniguruma-6.8.2-r0
open-iscsi-2.0.874-r0
open-isns-lib-0.97-r3
openntpd-6.2_p3-r1
openrc-0.35.5-r4
openrc-0.35.5-r5
openssh-keygen-7.7_p1-r3
openssh-server-7.7_p1-r3
openssh-server-common-7.7_p1-r3
openssl-1.0.2p-r0
openssl-dev-1.0.2p-r0
openssl-1.0.2q-r0
openssl-dev-1.0.2q-r0
opus-1.2.1-r1
p11-kit-0.23.10-r0
patch-2.7.6-r2
@ -240,7 +241,7 @@ pax-utils-1.2.3-r0
pcre-8.42-r0
pcre2-10.31-r0
pcsc-lite-libs-1.8.23-r1
perl-5.26.2-r1
perl-5.26.3-r0
pigz-2.4-r0
pinentry-1.1.0-r0
pixman-0.34.0-r5
@ -272,10 +273,10 @@ slang-dev-2.3.2-r0
snappy-1.1.4-r4
sntpc-0.9-r6
socat-1.7.3.2-r4
spice-server-0.14.0-r7
sqlite-libs-3.24.0-r0
spice-server-0.14.1-r0
sqlite-libs-3.25.3-r0
squashfs-tools-4.3-r4
ssl_client-1.28.4-r1
ssl_client-1.28.4-r3
strace-4.22-r0
sudo-1.8.23-r2
swig-3.0.12-r3
@ -284,7 +285,7 @@ tar-1.30-r0
tcl-8.6.7-r0
tcpdump-4.9.2-r3
tini-0.18.0-r0
tzdata-2018d-r1
tzdata-2018f-r0
udev-init-scripts-32-r2
udev-init-scripts-openrc-32-r2
usbredir-0.7.1-r0
@ -294,7 +295,7 @@ util-linux-dev-2.32-r0
vde2-libs-2.3.2-r9
vim-8.1.0115-r0
wayland-libs-server-1.15.0-r0
wireguard-tools-0.0.20180918-r0
wireguard-tools-0.0.20181218-r2
wireless-tools-30_pre9-r0
wpa_supplicant-2.6-r14
wpa_supplicant-openrc-2.6-r14

View File

@ -1,4 +1,4 @@
# linuxkit/alpine:6e3d117514a4fb46b4e394e0d2cbc32cf37ca20d-s390x
# linuxkit/alpine:38454edfbc59fc89a8efe9e5b16e944ad3e329b0-s390x
# automatically generated list of installed packages
abuild-3.2.0-r0
alpine-baselayout-3.1.0-r0
@ -24,7 +24,7 @@ btrfs-progs-4.17-r1
btrfs-progs-dev-4.17-r1
btrfs-progs-libs-4.17-r1
build-base-0.5-r1
busybox-1.28.4-r1
busybox-1.28.4-r3
busybox-initscripts-3.1-r3
bzip2-1.0.6-r6
ca-certificates-20171114-r3
@ -40,7 +40,7 @@ cmake-bash-completion-3.11.1-r2
coreutils-8.29-r2
cryptsetup-2.0.2-r3
cryptsetup-libs-2.0.2-r3
curl-7.61.1-r0
curl-7.61.1-r1
db-5.3.28-r0
dbus-libs-1.10.24-r1
device-mapper-libs-2.02.178-r0
@ -85,7 +85,7 @@ gmp-6.1.2-r1
gmp-dev-6.1.2-r1
gnupg-2.2.8-r0
gnutls-3.6.2-r0
go-1.10.1-r0
go-1.10.7-r0
grep-3.1-r2
guile-2.0.14-r0
guile-libs-2.0.14-r0
@ -105,9 +105,9 @@ keyutils-libs-1.5.10-r0
kmod-24-r1
kmod-openrc-24-r1
krb5-conf-1.0-r1
krb5-dev-1.15.3-r0
krb5-libs-1.15.3-r0
krb5-server-ldap-1.15.3-r0
krb5-dev-1.15.4-r0
krb5-libs-1.15.4-r0
krb5-server-ldap-1.15.4-r0
libacl-2.2.52-r5
libaio-0.3.111-r0
libarchive-3.3.2-r3
@ -126,8 +126,8 @@ libcap-2.25-r1
libcap-ng-0.7.9-r0
libcap-ng-dev-0.7.9-r0
libcom_err-1.44.2-r0
libcrypto1.0-1.0.2p-r0
libcurl-7.61.1-r0
libcrypto1.0-1.0.2q-r0
libcurl-7.61.1-r1
libdrm-2.4.92-r0
libedit-20170329.3.1-r3
libedit-dev-20170329.3.1-r3
@ -164,12 +164,12 @@ libressl-dev-2.7.4-r0
libressl2.7-libcrypto-2.7.4-r0
libressl2.7-libssl-2.7.4-r0
libressl2.7-libtls-2.7.4-r0
libsasl-2.1.26-r13
libsasl-2.1.26-r14
libseccomp-2.3.3-r1
libseccomp-dev-2.3.3-r1
libsmartcols-2.32-r0
libssh2-1.8.0-r3
libssl1.0-1.0.2p-r0
libssl1.0-1.0.2q-r0
libstdc++-6.4.0-r9
libtasn1-4.13-r0
libtirpc-1.0.3-r0
@ -180,7 +180,7 @@ libusb-1.0.22-r0
libuuid-2.32-r0
libuv-1.20.2-r0
libverto-0.3.0-r1
libwbclient-4.8.4-r0
libwbclient-4.8.8-r0
libxau-1.0.8-r2
libxcb-1.13-r2
libxdmcp-1.1.2-r4
@ -192,7 +192,7 @@ llvm5-dev-5.0.1-r4
llvm5-libs-5.0.1-r4
llvm5-static-5.0.1-r4
lsscsi-0.28-r0
lua5.3-libs-5.3.4-r5
lua5.3-libs-5.3.5-r1
lz4-libs-1.8.2-r0
lzip-1.20-r0
lzo-2.10-r2
@ -221,12 +221,12 @@ oniguruma-6.8.2-r0
open-iscsi-2.0.874-r0
open-isns-lib-0.97-r3
openntpd-6.2_p3-r1
openrc-0.35.5-r4
openrc-0.35.5-r5
openssh-keygen-7.7_p1-r3
openssh-server-7.7_p1-r3
openssh-server-common-7.7_p1-r3
openssl-1.0.2p-r0
openssl-dev-1.0.2p-r0
openssl-1.0.2q-r0
openssl-dev-1.0.2q-r0
opus-1.2.1-r1
p11-kit-0.23.10-r0
patch-2.7.6-r2
@ -234,7 +234,7 @@ pax-utils-1.2.3-r0
pcre-8.42-r0
pcre2-10.31-r0
pcsc-lite-libs-1.8.23-r1
perl-5.26.2-r1
perl-5.26.3-r0
pigz-2.4-r0
pinentry-1.1.0-r0
pixman-0.34.0-r5
@ -266,10 +266,10 @@ slang-dev-2.3.2-r0
snappy-1.1.4-r4
sntpc-0.9-r6
socat-1.7.3.2-r4
spice-server-0.14.0-r7
sqlite-libs-3.24.0-r0
spice-server-0.14.1-r0
sqlite-libs-3.25.3-r0
squashfs-tools-4.3-r4
ssl_client-1.28.4-r1
ssl_client-1.28.4-r3
strace-4.22-r0
sudo-1.8.23-r2
swig-3.0.12-r3
@ -288,7 +288,7 @@ util-linux-dev-2.32-r0
vde2-libs-2.3.2-r9
vim-8.1.0115-r0
wayland-libs-server-1.15.0-r0
wireguard-tools-0.0.20181018-r0
wireguard-tools-0.0.20181218-r2
wireless-tools-30_pre9-r0
wpa_supplicant-2.6-r14
wpa_supplicant-openrc-2.6-r14

View File

@ -1,4 +1,4 @@
# linuxkit/alpine:ace75d0ec6978762d445083d6c8c6336bdb658ed-amd64
# linuxkit/alpine:0de3332a65895be3a610a99377545c157ca4b138-amd64
# automatically generated list of installed packages
abuild-3.2.0-r0
alpine-baselayout-3.1.0-r0
@ -24,7 +24,7 @@ btrfs-progs-4.17-r1
btrfs-progs-dev-4.17-r1
btrfs-progs-libs-4.17-r1
build-base-0.5-r1
busybox-1.28.4-r1
busybox-1.28.4-r3
busybox-initscripts-3.1-r3
bzip2-1.0.6-r6
ca-certificates-20171114-r3
@ -40,7 +40,7 @@ cmake-bash-completion-3.11.1-r2
coreutils-8.29-r2
cryptsetup-2.0.2-r3
cryptsetup-libs-2.0.2-r3
curl-7.61.1-r0
curl-7.61.1-r1
db-5.3.28-r0
dbus-libs-1.10.24-r1
device-mapper-libs-2.02.178-r0
@ -86,7 +86,7 @@ gmp-6.1.2-r1
gmp-dev-6.1.2-r1
gnupg-2.2.8-r0
gnutls-3.6.2-r0
go-1.10.1-r0
go-1.10.7-r0
grep-3.1-r2
guile-2.0.14-r0
guile-libs-2.0.14-r0
@ -108,9 +108,9 @@ keyutils-libs-1.5.10-r0
kmod-24-r1
kmod-openrc-24-r1
krb5-conf-1.0-r1
krb5-dev-1.15.3-r0
krb5-libs-1.15.3-r0
krb5-server-ldap-1.15.3-r0
krb5-dev-1.15.4-r0
krb5-libs-1.15.4-r0
krb5-server-ldap-1.15.4-r0
lddtree-1.26-r1
libacl-2.2.52-r5
libaio-0.3.111-r0
@ -131,8 +131,8 @@ libcap-2.25-r1
libcap-ng-0.7.9-r0
libcap-ng-dev-0.7.9-r0
libcom_err-1.44.2-r0
libcrypto1.0-1.0.2p-r0
libcurl-7.61.1-r0
libcrypto1.0-1.0.2q-r0
libcurl-7.61.1-r1
libdrm-2.4.92-r0
libedit-20170329.3.1-r3
libedit-dev-20170329.3.1-r3
@ -159,7 +159,7 @@ libltdl-2.4.6-r5
libmagic-5.32-r0
libmnl-1.0.4-r0
libmount-2.32-r0
libmspack-0.7.1_alpha-r0
libmspack-0.8_alpha-r0
libnfsidmap-2.3.1-r4
libnftnl-libs-1.1.1-r0
libnl-1.1.4-r0
@ -173,12 +173,12 @@ libressl-dev-2.7.4-r0
libressl2.7-libcrypto-2.7.4-r0
libressl2.7-libssl-2.7.4-r0
libressl2.7-libtls-2.7.4-r0
libsasl-2.1.26-r13
libsasl-2.1.26-r14
libseccomp-2.3.3-r1
libseccomp-dev-2.3.3-r1
libsmartcols-2.32-r0
libssh2-1.8.0-r3
libssl1.0-1.0.2p-r0
libssl1.0-1.0.2q-r0
libstdc++-6.4.0-r9
libtasn1-4.13-r0
libtirpc-1.0.3-r0
@ -191,7 +191,7 @@ libusb-1.0.22-r0
libuuid-2.32-r0
libuv-1.20.2-r0
libverto-0.3.0-r1
libwbclient-4.8.4-r0
libwbclient-4.8.8-r0
libxau-1.0.8-r2
libxcb-1.13-r2
libxdmcp-1.1.2-r4
@ -203,7 +203,7 @@ llvm5-dev-5.0.1-r4
llvm5-libs-5.0.1-r4
llvm5-static-5.0.1-r4
lsscsi-0.28-r0
lua5.3-libs-5.3.4-r5
lua5.3-libs-5.3.5-r1
luajit-2.1.0_beta3-r4
luajit-dev-2.1.0_beta3-r4
lz4-libs-1.8.2-r0
@ -234,14 +234,14 @@ npth-1.5-r1
oniguruma-6.8.2-r0
open-iscsi-2.0.874-r0
open-isns-lib-0.97-r3
open-vm-tools-10.1.15-r2
open-vm-tools-10.1.15-r3
openntpd-6.2_p3-r1
openrc-0.35.5-r4
openrc-0.35.5-r5
openssh-keygen-7.7_p1-r3
openssh-server-7.7_p1-r3
openssh-server-common-7.7_p1-r3
openssl-1.0.2p-r0
openssl-dev-1.0.2p-r0
openssl-1.0.2q-r0
openssl-dev-1.0.2q-r0
opus-1.2.1-r1
ovmf-0.0.20170624-r0
p11-kit-0.23.10-r0
@ -250,7 +250,7 @@ pax-utils-1.2.3-r0
pcre-8.42-r0
pcre2-10.31-r0
pcsc-lite-libs-1.8.23-r1
perl-5.26.2-r1
perl-5.26.3-r0
pigz-2.4-r0
pinentry-1.1.0-r0
pixman-0.34.0-r5
@ -281,10 +281,10 @@ slang-dev-2.3.2-r0
snappy-1.1.4-r4
sntpc-0.9-r6
socat-1.7.3.2-r4
spice-server-0.14.0-r7
sqlite-libs-3.24.0-r0
spice-server-0.14.1-r0
sqlite-libs-3.25.3-r0
squashfs-tools-4.3-r4
ssl_client-1.28.4-r1
ssl_client-1.28.4-r3
strace-4.22-r0
sudo-1.8.23-r2
swig-3.0.12-r3
@ -304,7 +304,7 @@ util-linux-dev-2.32-r0
vde2-libs-2.3.2-r9
vim-8.1.0115-r0
wayland-libs-server-1.15.0-r0
wireguard-tools-0.0.20181018-r0
wireguard-tools-0.0.20181218-r2
wireless-tools-30_pre9-r0
wpa_supplicant-2.6-r14
wpa_supplicant-openrc-2.6-r14