mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-18 17:01:07 +00:00
alpine: Bump containerd to v1.2.6
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
This commit is contained in:
Rolf Neugebauer
parent
916b20a919
commit
2b32dde645
@ -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.5
|
||||
ENV CONTAINERD_COMMIT=v1.2.6
|
||||
RUN mkdir -p $GOPATH/src/github.com/containerd && \
|
||||
cd $GOPATH/src/github.com/containerd && \
|
||||
git clone https://github.com/containerd/containerd.git && \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# linuxkit/alpine:f20fe82103e63ff4ad69d3936515e1eda414405f-arm64
|
||||
# linuxkit/alpine:cac41a88d3dad1967965e3d29e2129609e4c3d37-arm64
|
||||
# automatically generated list of installed packages
|
||||
abuild-3.3.1-r0
|
||||
alpine-baselayout-3.1.0-r3
|
||||
@ -74,9 +74,9 @@ flex-libs-2.6.4-r1
|
||||
fortify-headers-1.0-r0
|
||||
fts-1.2.7-r1
|
||||
fts-dev-1.2.7-r1
|
||||
g++-8.2.0-r2
|
||||
g++-8.3.0-r0
|
||||
gc-7.6.4-r2
|
||||
gcc-8.2.0-r2
|
||||
gcc-8.3.0-r0
|
||||
gdbm-1.13-r1
|
||||
gettext-0.19.8.1-r4
|
||||
gettext-asprintf-0.19.8.1-r4
|
||||
@ -87,7 +87,7 @@ glib-2.58.1-r2
|
||||
gmp-6.1.2-r1
|
||||
gmp-dev-6.1.2-r1
|
||||
gnupg-2.2.12-r0
|
||||
gnutls-3.6.4-r0
|
||||
gnutls-3.6.7-r0
|
||||
go-1.11.5-r0
|
||||
grep-3.1-r2
|
||||
guile-2.0.14-r0
|
||||
@ -116,7 +116,7 @@ libaio-0.3.111-r0
|
||||
libarchive-3.3.2-r4
|
||||
libarchive-tools-3.3.2-r4
|
||||
libassuan-2.5.1-r0
|
||||
libatomic-8.2.0-r2
|
||||
libatomic-8.3.0-r0
|
||||
libattr-2.4.47-r7
|
||||
libblkid-2.33-r0
|
||||
libbsd-0.8.6-r2
|
||||
@ -124,12 +124,12 @@ libburn-1.5.0-r0
|
||||
libbz2-1.0.6-r6
|
||||
libc-dev-0.7.1-r0
|
||||
libc-utils-0.7.1-r0
|
||||
libc6-compat-1.1.20-r3
|
||||
libc6-compat-1.1.20-r4
|
||||
libcap-2.26-r0
|
||||
libcap-ng-0.7.9-r1
|
||||
libcap-ng-dev-0.7.9-r1
|
||||
libcom_err-1.44.5-r0
|
||||
libcrypto1.1-1.1.1a-r1
|
||||
libcrypto1.1-1.1.1b-r1
|
||||
libcurl-7.64.0-r1
|
||||
libdrm-2.4.96-r0
|
||||
libedit-20181209.3.1-r0
|
||||
@ -142,10 +142,10 @@ libexecinfo-1.1-r0
|
||||
libexecinfo-dev-1.1-r0
|
||||
libfdisk-2.33-r0
|
||||
libffi-3.2.1-r6
|
||||
libgcc-8.2.0-r2
|
||||
libgcc-8.3.0-r0
|
||||
libgcrypt-1.8.4-r0
|
||||
libgmpxx-6.1.2-r1
|
||||
libgomp-8.2.0-r2
|
||||
libgomp-8.3.0-r0
|
||||
libgpg-error-1.33-r0
|
||||
libintl-0.19.8.1-r4
|
||||
libisoburn-1.4.8-r0
|
||||
@ -172,9 +172,9 @@ libsasl-2.1.27-r1
|
||||
libseccomp-2.3.3-r1
|
||||
libseccomp-dev-2.3.3-r1
|
||||
libsmartcols-2.33-r0
|
||||
libssh2-1.8.0-r4
|
||||
libssl1.1-1.1.1a-r1
|
||||
libstdc++-8.2.0-r2
|
||||
libssh2-1.8.2-r0
|
||||
libssl1.1-1.1.1b-r1
|
||||
libstdc++-8.3.0-r0
|
||||
libtasn1-4.13-r0
|
||||
libtirpc-1.0.3-r0
|
||||
libtirpc-dev-1.0.3-r0
|
||||
@ -208,16 +208,16 @@ lzip-1.20-r0
|
||||
lzo-2.10-r2
|
||||
m4-1.4.18-r1
|
||||
make-4.2.1-r2
|
||||
mesa-gbm-18.1.7-r1
|
||||
mesa-gbm-18.1.7-r2
|
||||
mpc1-1.0.3-r1
|
||||
mpc1-dev-1.0.3-r1
|
||||
mpfr-dev-3.1.5-r1
|
||||
mpfr3-3.1.5-r1
|
||||
mtools-4.0.23-r0
|
||||
multipath-tools-0.7.9-r0
|
||||
musl-1.1.20-r3
|
||||
musl-dev-1.1.20-r3
|
||||
musl-utils-1.1.20-r3
|
||||
musl-1.1.20-r4
|
||||
musl-dev-1.1.20-r4
|
||||
musl-utils-1.1.20-r4
|
||||
ncurses-dev-6.1_p20190105-r0
|
||||
ncurses-libs-6.1_p20190105-r0
|
||||
ncurses-terminfo-6.1_p20190105-r0
|
||||
@ -236,8 +236,8 @@ openresolv-3.9.0-r0
|
||||
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
|
||||
openssl-1.1.1b-r1
|
||||
openssl-dev-1.1.1b-r1
|
||||
opus-1.3-r0
|
||||
p11-kit-0.23.14-r0
|
||||
patch-2.7.6-r4
|
||||
@ -252,7 +252,7 @@ pixman-0.34.0-r6
|
||||
pkgconf-1.6.0-r0
|
||||
popt-1.16-r7
|
||||
python2-2.7.15-r3
|
||||
python3-3.6.8-r1
|
||||
python3-3.6.8-r2
|
||||
qemu-3.1.0-r3
|
||||
qemu-aarch64-3.1.0-r3
|
||||
qemu-arm-3.1.0-r3
|
||||
@ -300,9 +300,9 @@ vde2-libs-2.3.2-r10
|
||||
vim-8.1.0630-r0
|
||||
virglrenderer-0.7.0-r1
|
||||
wayland-libs-server-1.16.0-r0
|
||||
wireguard-tools-0.0.20190227-r0
|
||||
wireguard-tools-wg-0.0.20190227-r0
|
||||
wireguard-tools-wg-quick-0.0.20190227-r0
|
||||
wireguard-tools-0.0.20190406-r0
|
||||
wireguard-tools-wg-0.0.20190406-r0
|
||||
wireguard-tools-wg-quick-0.0.20190406-r0
|
||||
wireless-tools-30_pre9-r0
|
||||
wpa_supplicant-2.7-r0
|
||||
wpa_supplicant-openrc-2.7-r0
|
||||
@ -312,7 +312,7 @@ xorriso-1.4.8-r0
|
||||
xz-5.2.4-r0
|
||||
xz-dev-5.2.4-r0
|
||||
xz-libs-5.2.4-r0
|
||||
zfs-0.7.12-r0
|
||||
zfs-libs-0.7.12-r0
|
||||
zfs-0.7.12-r1
|
||||
zfs-libs-0.7.12-r1
|
||||
zlib-1.2.11-r1
|
||||
zlib-dev-1.2.11-r1
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# linuxkit/alpine:4703ded9a2e82b8963b5f5a982e4ba49efe88628-s390x
|
||||
# linuxkit/alpine:f6c99e2325c4e0d8d439aac34e5d8c718aa73874-s390x
|
||||
# automatically generated list of installed packages
|
||||
abuild-3.3.1-r0
|
||||
alpine-baselayout-3.1.0-r3
|
||||
@ -74,9 +74,9 @@ flex-libs-2.6.4-r1
|
||||
fortify-headers-1.0-r0
|
||||
fts-1.2.7-r1
|
||||
fts-dev-1.2.7-r1
|
||||
g++-8.2.0-r2
|
||||
g++-8.3.0-r0
|
||||
gc-7.6.4-r2
|
||||
gcc-8.2.0-r2
|
||||
gcc-8.3.0-r0
|
||||
gdbm-1.13-r1
|
||||
gettext-0.19.8.1-r4
|
||||
gettext-asprintf-0.19.8.1-r4
|
||||
@ -87,7 +87,7 @@ glib-2.58.1-r2
|
||||
gmp-6.1.2-r1
|
||||
gmp-dev-6.1.2-r1
|
||||
gnupg-2.2.12-r0
|
||||
gnutls-3.6.4-r0
|
||||
gnutls-3.6.7-r0
|
||||
go-1.11.5-r0
|
||||
grep-3.1-r2
|
||||
guile-2.0.14-r0
|
||||
@ -116,7 +116,7 @@ libaio-0.3.111-r0
|
||||
libarchive-3.3.2-r4
|
||||
libarchive-tools-3.3.2-r4
|
||||
libassuan-2.5.1-r0
|
||||
libatomic-8.2.0-r2
|
||||
libatomic-8.3.0-r0
|
||||
libattr-2.4.47-r7
|
||||
libblkid-2.33-r0
|
||||
libbsd-0.8.6-r2
|
||||
@ -124,12 +124,12 @@ libburn-1.5.0-r0
|
||||
libbz2-1.0.6-r6
|
||||
libc-dev-0.7.1-r0
|
||||
libc-utils-0.7.1-r0
|
||||
libc6-compat-1.1.20-r3
|
||||
libc6-compat-1.1.20-r4
|
||||
libcap-2.26-r0
|
||||
libcap-ng-0.7.9-r1
|
||||
libcap-ng-dev-0.7.9-r1
|
||||
libcom_err-1.44.5-r0
|
||||
libcrypto1.1-1.1.1a-r1
|
||||
libcrypto1.1-1.1.1b-r1
|
||||
libcurl-7.64.0-r1
|
||||
libdrm-2.4.96-r0
|
||||
libedit-20181209.3.1-r0
|
||||
@ -140,10 +140,10 @@ libepoxy-1.5.3-r0
|
||||
libevent-2.1.8-r6
|
||||
libfdisk-2.33-r0
|
||||
libffi-3.2.1-r6
|
||||
libgcc-8.2.0-r2
|
||||
libgcc-8.3.0-r0
|
||||
libgcrypt-1.8.4-r0
|
||||
libgmpxx-6.1.2-r1
|
||||
libgomp-8.2.0-r2
|
||||
libgomp-8.3.0-r0
|
||||
libgpg-error-1.33-r0
|
||||
libintl-0.19.8.1-r4
|
||||
libisoburn-1.4.8-r0
|
||||
@ -170,9 +170,9 @@ libsasl-2.1.27-r1
|
||||
libseccomp-2.3.3-r1
|
||||
libseccomp-dev-2.3.3-r1
|
||||
libsmartcols-2.33-r0
|
||||
libssh2-1.8.0-r4
|
||||
libssl1.1-1.1.1a-r1
|
||||
libstdc++-8.2.0-r2
|
||||
libssh2-1.8.2-r0
|
||||
libssl1.1-1.1.1b-r1
|
||||
libstdc++-8.3.0-r0
|
||||
libtasn1-4.13-r0
|
||||
libtirpc-1.0.3-r0
|
||||
libtirpc-dev-1.0.3-r0
|
||||
@ -202,16 +202,16 @@ lzip-1.20-r0
|
||||
lzo-2.10-r2
|
||||
m4-1.4.18-r1
|
||||
make-4.2.1-r2
|
||||
mesa-gbm-18.1.7-r1
|
||||
mesa-gbm-18.1.7-r2
|
||||
mpc1-1.0.3-r1
|
||||
mpc1-dev-1.0.3-r1
|
||||
mpfr-dev-3.1.5-r1
|
||||
mpfr3-3.1.5-r1
|
||||
mtools-4.0.23-r0
|
||||
multipath-tools-0.7.9-r0
|
||||
musl-1.1.20-r3
|
||||
musl-dev-1.1.20-r3
|
||||
musl-utils-1.1.20-r3
|
||||
musl-1.1.20-r4
|
||||
musl-dev-1.1.20-r4
|
||||
musl-utils-1.1.20-r4
|
||||
ncurses-dev-6.1_p20190105-r0
|
||||
ncurses-libs-6.1_p20190105-r0
|
||||
ncurses-terminfo-6.1_p20190105-r0
|
||||
@ -230,8 +230,8 @@ openresolv-3.9.0-r0
|
||||
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
|
||||
openssl-1.1.1b-r1
|
||||
openssl-dev-1.1.1b-r1
|
||||
opus-1.3-r0
|
||||
p11-kit-0.23.14-r0
|
||||
patch-2.7.6-r4
|
||||
@ -246,7 +246,7 @@ pixman-0.34.0-r6
|
||||
pkgconf-1.6.0-r0
|
||||
popt-1.16-r7
|
||||
python2-2.7.15-r3
|
||||
python3-3.6.8-r1
|
||||
python3-3.6.8-r2
|
||||
qemu-3.1.0-r3
|
||||
qemu-aarch64-3.1.0-r3
|
||||
qemu-arm-3.1.0-r3
|
||||
@ -293,9 +293,9 @@ vde2-libs-2.3.2-r10
|
||||
vim-8.1.0630-r0
|
||||
virglrenderer-0.7.0-r1
|
||||
wayland-libs-server-1.16.0-r0
|
||||
wireguard-tools-0.0.20190227-r0
|
||||
wireguard-tools-wg-0.0.20190227-r0
|
||||
wireguard-tools-wg-quick-0.0.20190227-r0
|
||||
wireguard-tools-0.0.20190406-r0
|
||||
wireguard-tools-wg-0.0.20190406-r0
|
||||
wireguard-tools-wg-quick-0.0.20190406-r0
|
||||
wireless-tools-30_pre9-r0
|
||||
wpa_supplicant-2.7-r0
|
||||
wpa_supplicant-openrc-2.7-r0
|
||||
@ -305,7 +305,7 @@ xorriso-1.4.8-r0
|
||||
xz-5.2.4-r0
|
||||
xz-dev-5.2.4-r0
|
||||
xz-libs-5.2.4-r0
|
||||
zfs-0.7.12-r0
|
||||
zfs-libs-0.7.12-r0
|
||||
zfs-0.7.12-r1
|
||||
zfs-libs-0.7.12-r1
|
||||
zlib-1.2.11-r1
|
||||
zlib-dev-1.2.11-r1
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# linuxkit/alpine:6ed32ba2b29a12b3d75f3d5b9be1b4ac00e7d479-amd64
|
||||
# linuxkit/alpine:86cd4f51b49fb9a078b50201d892a3c7973d48ec-amd64
|
||||
# automatically generated list of installed packages
|
||||
abuild-3.3.1-r0
|
||||
alpine-baselayout-3.1.0-r3
|
||||
@ -77,9 +77,9 @@ fts-dev-1.2.7-r1
|
||||
fuse-2.9.8-r2
|
||||
fuse-common-3.2.6-r1
|
||||
fuse-openrc-3.2.6-r1
|
||||
g++-8.2.0-r2
|
||||
g++-8.3.0-r0
|
||||
gc-7.6.4-r2
|
||||
gcc-8.2.0-r2
|
||||
gcc-8.3.0-r0
|
||||
gdbm-1.13-r1
|
||||
gettext-0.19.8.1-r4
|
||||
gettext-asprintf-0.19.8.1-r4
|
||||
@ -90,7 +90,7 @@ glib-2.58.1-r2
|
||||
gmp-6.1.2-r1
|
||||
gmp-dev-6.1.2-r1
|
||||
gnupg-2.2.12-r0
|
||||
gnutls-3.6.4-r0
|
||||
gnutls-3.6.7-r0
|
||||
go-1.11.5-r0
|
||||
grep-3.1-r2
|
||||
guile-2.0.14-r0
|
||||
@ -122,7 +122,7 @@ libaio-0.3.111-r0
|
||||
libarchive-3.3.2-r4
|
||||
libarchive-tools-3.3.2-r4
|
||||
libassuan-2.5.1-r0
|
||||
libatomic-8.2.0-r2
|
||||
libatomic-8.3.0-r0
|
||||
libattr-2.4.47-r7
|
||||
libblkid-2.33-r0
|
||||
libbsd-0.8.6-r2
|
||||
@ -130,12 +130,12 @@ libburn-1.5.0-r0
|
||||
libbz2-1.0.6-r6
|
||||
libc-dev-0.7.1-r0
|
||||
libc-utils-0.7.1-r0
|
||||
libc6-compat-1.1.20-r3
|
||||
libc6-compat-1.1.20-r4
|
||||
libcap-2.26-r0
|
||||
libcap-ng-0.7.9-r1
|
||||
libcap-ng-dev-0.7.9-r1
|
||||
libcom_err-1.44.5-r0
|
||||
libcrypto1.1-1.1.1a-r1
|
||||
libcrypto1.1-1.1.1b-r1
|
||||
libcurl-7.64.0-r1
|
||||
libdrm-2.4.96-r0
|
||||
libedit-20181209.3.1-r0
|
||||
@ -148,10 +148,10 @@ libexecinfo-1.1-r0
|
||||
libexecinfo-dev-1.1-r0
|
||||
libfdisk-2.33-r0
|
||||
libffi-3.2.1-r6
|
||||
libgcc-8.2.0-r2
|
||||
libgcc-8.3.0-r0
|
||||
libgcrypt-1.8.4-r0
|
||||
libgmpxx-6.1.2-r1
|
||||
libgomp-8.2.0-r2
|
||||
libgomp-8.3.0-r0
|
||||
libgpg-error-1.33-r0
|
||||
libintl-0.19.8.1-r4
|
||||
libisoburn-1.4.8-r0
|
||||
@ -180,9 +180,9 @@ libsasl-2.1.27-r1
|
||||
libseccomp-2.3.3-r1
|
||||
libseccomp-dev-2.3.3-r1
|
||||
libsmartcols-2.33-r0
|
||||
libssh2-1.8.0-r4
|
||||
libssl1.1-1.1.1a-r1
|
||||
libstdc++-8.2.0-r2
|
||||
libssh2-1.8.2-r0
|
||||
libssl1.1-1.1.1b-r1
|
||||
libstdc++-8.3.0-r0
|
||||
libtasn1-4.13-r0
|
||||
libtirpc-1.0.3-r0
|
||||
libtirpc-dev-1.0.3-r0
|
||||
@ -216,7 +216,7 @@ lzip-1.20-r0
|
||||
lzo-2.10-r2
|
||||
m4-1.4.18-r1
|
||||
make-4.2.1-r2
|
||||
mesa-gbm-18.1.7-r1
|
||||
mesa-gbm-18.1.7-r2
|
||||
mkinitfs-3.4.1-r0
|
||||
mpc1-1.0.3-r1
|
||||
mpc1-dev-1.0.3-r1
|
||||
@ -224,9 +224,9 @@ mpfr-dev-3.1.5-r1
|
||||
mpfr3-3.1.5-r1
|
||||
mtools-4.0.23-r0
|
||||
multipath-tools-0.7.9-r0
|
||||
musl-1.1.20-r3
|
||||
musl-dev-1.1.20-r3
|
||||
musl-utils-1.1.20-r3
|
||||
musl-1.1.20-r4
|
||||
musl-dev-1.1.20-r4
|
||||
musl-utils-1.1.20-r4
|
||||
ncurses-dev-6.1_p20190105-r0
|
||||
ncurses-libs-6.1_p20190105-r0
|
||||
ncurses-terminfo-6.1_p20190105-r0
|
||||
@ -247,8 +247,8 @@ openresolv-3.9.0-r0
|
||||
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
|
||||
openssl-1.1.1b-r1
|
||||
openssl-dev-1.1.1b-r1
|
||||
opus-1.3-r0
|
||||
ovmf-0.0.20170624-r0
|
||||
p11-kit-0.23.14-r0
|
||||
@ -264,7 +264,7 @@ pixman-0.34.0-r6
|
||||
pkgconf-1.6.0-r0
|
||||
popt-1.16-r7
|
||||
python2-2.7.15-r3
|
||||
python3-3.6.8-r1
|
||||
python3-3.6.8-r2
|
||||
qemu-3.1.0-r3
|
||||
qemu-aarch64-3.1.0-r3
|
||||
qemu-arm-3.1.0-r3
|
||||
@ -312,9 +312,9 @@ vde2-libs-2.3.2-r10
|
||||
vim-8.1.0630-r0
|
||||
virglrenderer-0.7.0-r1
|
||||
wayland-libs-server-1.16.0-r0
|
||||
wireguard-tools-0.0.20190227-r0
|
||||
wireguard-tools-wg-0.0.20190227-r0
|
||||
wireguard-tools-wg-quick-0.0.20190227-r0
|
||||
wireguard-tools-0.0.20190406-r0
|
||||
wireguard-tools-wg-0.0.20190406-r0
|
||||
wireguard-tools-wg-quick-0.0.20190406-r0
|
||||
wireless-tools-30_pre9-r0
|
||||
wpa_supplicant-2.7-r0
|
||||
wpa_supplicant-openrc-2.7-r0
|
||||
@ -324,7 +324,7 @@ xorriso-1.4.8-r0
|
||||
xz-5.2.4-r0
|
||||
xz-dev-5.2.4-r0
|
||||
xz-libs-5.2.4-r0
|
||||
zfs-0.7.12-r0
|
||||
zfs-libs-0.7.12-r0
|
||||
zfs-0.7.12-r1
|
||||
zfs-libs-0.7.12-r1
|
||||
zlib-1.2.11-r1
|
||||
zlib-dev-1.2.11-r1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user