From 0b39a484b1b96918b3a77c74ee28787a5627d26b Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Fri, 18 Mar 2022 12:10:22 +0200 Subject: [PATCH] containerd-dev separate Signed-off-by: Avi Deitcher --- pkg/containerd/Dockerfile | 15 ++--- pkg/init/Dockerfile | 4 +- tools/alpine/Dockerfile | 17 ------ tools/alpine/versions.aarch64 | 102 ++++++++++++++++---------------- tools/alpine/versions.s390x | 102 ++++++++++++++++---------------- tools/alpine/versions.x86_64 | 102 ++++++++++++++++---------------- tools/containerd-dev/Dockerfile | 29 +++++++++ tools/containerd-dev/build.yml | 2 + 8 files changed, 191 insertions(+), 182 deletions(-) create mode 100644 tools/containerd-dev/Dockerfile create mode 100644 tools/containerd-dev/build.yml diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index aaa215283..c4d2df8cf 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,21 +1,14 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 as alpine +FROM linuxkit/alpine:5d89cd05a567f9bfbe4502be1027a422d46f4a75 as alpine + RUN apk add tzdata binutils - -WORKDIR $GOPATH/src/github.com/containerd/containerd -RUN cp bin/containerd bin/ctr bin/containerd-shim bin/containerd-shim-runc-v2 /usr/bin/ - -RUN strip /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2 - RUN mkdir -p /etc/init.d && ln -s /usr/bin/service /etc/init.d/020-containerd -WORKDIR / -COPY . . +FROM linuxkit/containerd-dev:e6a8da1e270da1601ed1bb85bb44c4442e5d51be as containerd-dev FROM scratch ENTRYPOINT [] WORKDIR / -COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2 /usr/bin/ -COPY --from=alpine /etc/containerd/config.toml /etc/containerd/ +COPY --from=containerd-dev /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2 /usr/bin/ COPY --from=alpine /usr/share/zoneinfo/UTC /etc/localtime COPY --from=alpine /etc/init.d/ /etc/init.d/ COPY etc etc/ diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 3c9e12c47..b5cf931a9 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,5 @@ -FROM linuxkit/alpine:33063834cf72d563cd8703467836aaa2f2b5a300 AS build +FROM linuxkit/containerd-dev:e6a8da1e270da1601ed1bb85bb44c4442e5d51be AS containerd-dev +FROM linuxkit/alpine:5d89cd05a567f9bfbe4502be1027a422d46f4a75 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ @@ -15,6 +16,7 @@ RUN go-compile.sh /go/src/cmd/rc.init # this makes sure that the multi stage build copies as a symlink RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.shutdown +COPY --from=containerd-dev /go/src/github.com/containerd/containerd $GOPATH/src/github.com/containerd/containerd RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd RUN go-compile.sh /go/src/cmd/service diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index be9cf01c1..957619b9f 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -36,22 +36,6 @@ RUN go get -u golang.org/x/lint/golint RUN go get -u github.com/gordonklaus/ineffassign RUN go get -u github.com/LK4D4/vndr -# checkout and compile containerd -# Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and -# `test/pkg/containerd/Dockerfile` when changing this. -# when building, note that containerd does not use go modules in the below commit, -# while go1.16 defaults to using it, so must disable with GO111MODULE=off -ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -ENV CONTAINERD_COMMIT=v1.4.11 -RUN mkdir -p $GOPATH/src/github.com/containerd && \ - cd $GOPATH/src/github.com/containerd && \ - git clone https://github.com/containerd/containerd.git && \ - cd $GOPATH/src/github.com/containerd/containerd && \ - git checkout $CONTAINERD_COMMIT -RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make libseccomp-dev -RUN cd $GOPATH/src/github.com/containerd/containerd && \ - GO111MODULE=off make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper" - # Checkout and compile iucode-tool for Intel CPU microcode # On non-x86_64 create a dummy file to copy below. ENV IUCODE_REPO=https://gitlab.com/iucode-tool/iucode-tool @@ -82,7 +66,6 @@ COPY --from=mirror /etc/apk/keys /etc/apk/keys/ COPY --from=mirror /mirror /mirror/ COPY --from=mirror /go/bin /go/bin/ COPY --from=mirror /Dockerfile /Dockerfile -COPY --from=mirror /go/src/github.com/containerd/containerd /go/src/github.com/containerd/containerd/ COPY --from=mirror /iucode_tool /usr/bin/ RUN apk update && apk upgrade -a diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index bf8776c36..8546379b9 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:1efed58cf4b0d01dbca768b28c2869723e1cd569- +# linuxkit/alpine:6f9efe87b3c394196949985f0ed6b5263432670a-arm64 # automatically generated list of installed packages abuild-3.8.0_rc4-r0 alpine-baselayout-3.2.0-r16 @@ -19,7 +19,7 @@ binutils-2.35.2-r2 binutils-dev-2.35.2-r2 binutils-gold-2.35.2-r2 bison-3.7.6-r0 -blkid-2.37-r0 +blkid-2.37.4-r0 bridge-utils-1.7.1-r0 brotli-libs-1.0.9-r5 bsd-compat-headers-0.7.2-r3 @@ -27,13 +27,13 @@ btrfs-progs-5.12.1-r0 btrfs-progs-dev-5.12.1-r0 btrfs-progs-libs-5.12.1-r0 build-base-0.5-r2 -busybox-1.33.1-r3 +busybox-1.33.1-r6 busybox-initscripts-3.3-r1 bzip2-1.0.8-r1 -ca-certificates-20191127-r5 -ca-certificates-bundle-20191127-r5 +ca-certificates-20211220-r0 +ca-certificates-bundle-20211220-r0 cdrkit-1.1.11-r3 -cfdisk-2.37-r0 +cfdisk-2.37.4-r0 cifs-utils-6.13-r0 clang-11.1.0-r1 clang-dev-11.1.0-r1 @@ -42,9 +42,9 @@ clang-libs-11.1.0-r1 clang-static-11.1.0-r1 cmake-3.20.3-r0 coreutils-8.32-r2 -cryptsetup-2.3.6-r0 -cryptsetup-libs-2.3.6-r0 -cryptsetup-openrc-2.3.6-r0 +cryptsetup-2.3.7-r0 +cryptsetup-libs-2.3.7-r0 +cryptsetup-openrc-2.3.7-r0 curl-7.79.1-r0 dbus-libs-1.12.20-r2 device-mapper-2.02.187-r1 @@ -65,16 +65,16 @@ ethtool-5.12-r0 eudev-3.2.10-r0 eudev-libs-3.2.10-r0 eudev-openrc-3.2.10-r0 -expat-2.4.1-r0 +expat-2.4.7-r0 expect-5.45.4-r0 fakeroot-1.25.3-r3 file-5.40-r1 -findmnt-2.37-r0 +findmnt-2.37.4-r0 findutils-4.8.0-r1 flex-2.6.4-r2 flex-dev-2.6.4-r2 flex-libs-2.6.4-r2 -flock-2.37-r0 +flock-2.37.4-r0 fortify-headers-1.1-r1 fts-1.2.7-r1 fts-dev-1.2.7-r1 @@ -90,15 +90,15 @@ gettext-libs-0.21-r0 git-2.32.0-r0 git-perl-2.32.0-r0 glib-2.68.3-r0 -gmp-6.2.1-r0 -gmp-dev-6.2.1-r0 +gmp-6.2.1-r1 +gmp-dev-6.2.1-r1 gnupg-2.2.31-r0 gnutls-3.7.1-r0 go-1.16.10-r0 grep-3.7-r0 guile-3.0.6-r0 guile-libs-3.0.6-r0 -hexdump-2.37-r0 +hexdump-2.37.4-r0 hvtools-4.11.9-r1 ifupdown-ng-0.11.3-r0 ifupdown-ng-ethtool-0.11.3-r0 @@ -132,12 +132,12 @@ krb5-libs-1.18.4-r0 krb5-server-ldap-1.18.4-r0 libacl-2.2.53-r0 libaio-0.3.112-r1 -libarchive-3.5.1-r0 -libarchive-tools-3.5.1-r0 +libarchive-3.5.2-r0 +libarchive-tools-3.5.2-r0 libassuan-2.5.5-r0 libatomic-10.3.1_git20210424-r2 libattr-2.5.1-r0 -libblkid-2.37-r0 +libblkid-2.37.4-r0 libbsd-0.11.3-r0 libburn-1.5.4-r0 libbz2-1.0.8-r1 @@ -148,7 +148,7 @@ libcap-2.50-r0 libcap-ng-0.8.2-r0 libcap-ng-dev-0.8.2-r0 libcom_err-1.46.2-r0 -libcrypto1.1-1.1.1l-r0 +libcrypto1.1-1.1.1n-r0 libcurl-7.79.1-r0 libdrm-2.4.106-r0 libeconf-0.3.8-r1 @@ -158,12 +158,12 @@ libelf-0.182-r1 libelf-static-0.182-r1 libepoxy-1.5.8-r0 libevent-2.1.12-r2 -libfdisk-2.37-r0 +libfdisk-2.37.4-r0 libfdt-1.6.1-r0 libffi-3.3-r2 libgcc-10.3.1_git20210424-r2 libgcrypt-1.9.4-r0 -libgmpxx-6.2.1-r0 +libgmpxx-6.2.1-r1 libgomp-10.3.1_git20210424-r2 libgpg-error-1.42-r0 libgphobos-10.3.1_git20210424-r2 @@ -177,24 +177,24 @@ libltdl-2.4.6-r7 libmagic-5.40-r1 libmd-1.0.3-r0 libmnl-1.0.4-r1 -libmount-2.37-r0 +libmount-2.37.4-r0 libnfsidmap-2.5.3-r0 libnftnl-libs-1.2.0-r0 libnl3-3.5.0-r0 libpcap-1.10.0-r0 libpng-1.6.37-r1 -libressl-dev-3.3.3-r0 -libressl3.3-libcrypto-3.3.3-r0 -libressl3.3-libssl-3.3.3-r0 -libressl3.3-libtls-3.3.3-r0 +libressl-dev-3.3.6-r0 +libressl3.3-libcrypto-3.3.6-r0 +libressl3.3-libssl-3.3.6-r0 +libressl3.3-libtls-3.3.6-r0 libretls-3.3.3p1-r2 libsasl-2.1.27-r12 libseccomp-2.5.1-r2 libseccomp-dev-2.5.1-r2 libseccomp-static-2.5.1-r2 libsecret-0.20.4-r1 -libsmartcols-2.37-r0 -libssl1.1-1.1.1l-r0 +libsmartcols-2.37.4-r0 +libssl1.1-1.1.1n-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtirpc-1.3.2-r0 @@ -208,23 +208,23 @@ libunistring-0.9.10-r1 libunwind-1.5.0-r1 libunwind-dev-1.5.0-r1 libusb-1.0.24-r2 -libuuid-2.37-r0 +libuuid-2.37.4-r0 libuv-1.41.0-r0 libverto-0.3.2-r0 -libwbclient-4.14.8-r0 +libwbclient-4.14.12-r0 libx11-1.7.2-r0 libxau-1.0.9-r0 libxcb-1.14-r2 libxdmcp-1.1.3-r0 libxkbcommon-1.2.1-r0 -libxml2-2.9.12-r1 +libxml2-2.9.13-r0 linux-headers-5.10.41-r0 llvm11-11.1.0-r2 llvm11-dev-11.1.0-r2 llvm11-libs-11.1.0-r2 llvm11-static-11.1.0-r2 -logger-2.37-r0 -lsblk-2.37-r0 +logger-2.37.4-r0 +lsblk-2.37.4-r0 lsscsi-0.32-r0 lua5.3-libs-5.3.6-r0 luajit-2.1_p20210510-r0 @@ -232,12 +232,12 @@ luajit-dev-2.1_p20210510-r0 lvm2-2.02.187-r1 lvm2-libs-2.02.187-r1 lvm2-openrc-2.02.187-r1 -lz4-libs-1.9.3-r0 +lz4-libs-1.9.3-r1 lzip-1.22-r0 lzo-2.10-r2 m4-1.4.18-r2 make-4.3-r0 -mcookie-2.37-r0 +mcookie-2.37.4-r0 mesa-21.1.2-r0 mesa-gbm-21.1.2-r0 mpc1-1.2.1-r0 @@ -274,10 +274,10 @@ openssh-client-default-8.6_p1-r3 openssh-keygen-8.6_p1-r3 openssh-server-8.6_p1-r3 openssh-server-common-8.6_p1-r3 -openssl-1.1.1l-r0 -openssl-dev-1.1.1l-r0 +openssl-1.1.1n-r0 +openssl-dev-1.1.1n-r0 p11-kit-0.23.22-r0 -partx-2.37-r0 +partx-2.37.4-r0 patch-2.7.6-r7 pcre-8.44-r0 pcre2-10.36-r0 @@ -291,7 +291,7 @@ pixman-0.40.0-r2 pkgconf-1.7.4-r0 popt-1.18-r0 python2-2.7.18-r2 -python3-3.9.5-r1 +python3-3.9.5-r2 qemu-6.0.0-r5 qemu-aarch64-6.0.0-r5 qemu-arm-6.0.0-r5 @@ -308,11 +308,11 @@ rpcbind-openrc-1.2.6-r0 rsync-3.2.3-r4 rsync-openrc-3.2.3-r4 s6-ipcserver-2.10.0.3-r0 -samba-util-libs-4.14.8-r0 +samba-util-libs-4.14.12-r0 scanelf-1.3.2-r0 sed-4.8-r0 -setpriv-2.37-r0 -sfdisk-2.37-r0 +setpriv-2.37.4-r0 +sfdisk-2.37.4-r0 sg3_utils-1.45-r0 sgdisk-1.0.8-r0 skalibs-2.10.0.3-r0 @@ -323,8 +323,8 @@ sntpc-0.9-r7 sntpc-openrc-0.9-r7 socat-1.7.4.1-r1 sqlite-libs-3.35.5-r0 -squashfs-tools-4.5-r0 -ssl_client-1.33.1-r3 +squashfs-tools-4.5-r1 +ssl_client-1.33.1-r6 strace-5.12-r0 swig-4.0.2-r2 talloc-2.3.2-r1 @@ -333,18 +333,18 @@ tcl-8.6.10-r1 tcpdump-4.99.0-r0 tevent-0.10.2-r1 tini-0.19.0-r0 -tzdata-2021e-r0 +tzdata-2022a-r0 udev-init-scripts-34-r0 udev-init-scripts-openrc-34-r0 userspace-rcu-0.12.2-r0 -util-linux-2.37-r0 -util-linux-dev-2.37-r0 -util-linux-openrc-2.37-r0 +util-linux-2.37.4-r0 +util-linux-dev-2.37.4-r0 +util-linux-openrc-2.37.4-r0 utmps-0.1.0.2-r0 utmps-openrc-0.1.0.2-r0 -uuidgen-2.37-r0 +uuidgen-2.37.4-r0 vde2-libs-2.3.2-r13 -vim-8.2.3437-r0 +vim-8.2.4173-r0 virglrenderer-0.8.2-r1 wayland-libs-server-1.19.0-r0 wireguard-tools-1.0.20210424-r0 @@ -357,7 +357,7 @@ xfsprogs-5.12.0-r0 xfsprogs-extra-5.12.0-r0 xkeyboard-config-2.33-r0 xorriso-1.5.4-r0 -xxd-8.2.3437-r0 +xxd-8.2.4173-r0 xz-5.2.5-r0 xz-dev-5.2.5-r0 xz-libs-5.2.5-r0 diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x index f780a93ca..e3198d4a2 100644 --- a/tools/alpine/versions.s390x +++ b/tools/alpine/versions.s390x @@ -1,4 +1,4 @@ -# linuxkit/alpine:980844e7096d47d2c88f9f762b41ecf512dc4081-s390x +# linuxkit/alpine:b5e3e740974c2304f2eb8b71def4a91f18cf5a65-s390x # automatically generated list of installed packages abuild-3.8.0_rc4-r0 alpine-baselayout-3.2.0-r16 @@ -18,7 +18,7 @@ bc-1.07.1-r1 binutils-2.35.2-r2 binutils-dev-2.35.2-r2 bison-3.7.6-r0 -blkid-2.37-r0 +blkid-2.37.4-r0 bridge-utils-1.7.1-r0 brotli-libs-1.0.9-r5 bsd-compat-headers-0.7.2-r3 @@ -26,13 +26,13 @@ btrfs-progs-5.12.1-r0 btrfs-progs-dev-5.12.1-r0 btrfs-progs-libs-5.12.1-r0 build-base-0.5-r2 -busybox-1.33.1-r3 +busybox-1.33.1-r6 busybox-initscripts-3.3-r1 bzip2-1.0.8-r1 -ca-certificates-20191127-r5 -ca-certificates-bundle-20191127-r5 +ca-certificates-20211220-r0 +ca-certificates-bundle-20211220-r0 cdrkit-1.1.11-r3 -cfdisk-2.37-r0 +cfdisk-2.37.4-r0 cifs-utils-6.13-r0 clang-11.1.0-r1 clang-dev-11.1.0-r1 @@ -41,9 +41,9 @@ clang-libs-11.1.0-r1 clang-static-11.1.0-r1 cmake-3.20.3-r0 coreutils-8.32-r2 -cryptsetup-2.3.6-r0 -cryptsetup-libs-2.3.6-r0 -cryptsetup-openrc-2.3.6-r0 +cryptsetup-2.3.7-r0 +cryptsetup-libs-2.3.7-r0 +cryptsetup-openrc-2.3.7-r0 curl-7.79.1-r0 dbus-libs-1.12.20-r2 device-mapper-2.02.187-r1 @@ -64,16 +64,16 @@ ethtool-5.12-r0 eudev-3.2.10-r0 eudev-libs-3.2.10-r0 eudev-openrc-3.2.10-r0 -expat-2.4.1-r0 +expat-2.4.7-r0 expect-5.45.4-r0 fakeroot-1.25.3-r3 file-5.40-r1 -findmnt-2.37-r0 +findmnt-2.37.4-r0 findutils-4.8.0-r1 flex-2.6.4-r2 flex-dev-2.6.4-r2 flex-libs-2.6.4-r2 -flock-2.37-r0 +flock-2.37.4-r0 fortify-headers-1.1-r1 fts-1.2.7-r1 fts-dev-1.2.7-r1 @@ -89,15 +89,15 @@ gettext-libs-0.21-r0 git-2.32.0-r0 git-perl-2.32.0-r0 glib-2.68.3-r0 -gmp-6.2.1-r0 -gmp-dev-6.2.1-r0 +gmp-6.2.1-r1 +gmp-dev-6.2.1-r1 gnupg-2.2.31-r0 gnutls-3.7.1-r0 go-1.16.10-r0 grep-3.7-r0 guile-3.0.6-r0 guile-libs-3.0.6-r0 -hexdump-2.37-r0 +hexdump-2.37.4-r0 hvtools-4.11.9-r1 ifupdown-ng-0.11.3-r0 ifupdown-ng-ethtool-0.11.3-r0 @@ -131,12 +131,12 @@ krb5-libs-1.18.4-r0 krb5-server-ldap-1.18.4-r0 libacl-2.2.53-r0 libaio-0.3.112-r1 -libarchive-3.5.1-r0 -libarchive-tools-3.5.1-r0 +libarchive-3.5.2-r0 +libarchive-tools-3.5.2-r0 libassuan-2.5.5-r0 libatomic-10.3.1_git20210424-r2 libattr-2.5.1-r0 -libblkid-2.37-r0 +libblkid-2.37.4-r0 libbsd-0.11.3-r0 libburn-1.5.4-r0 libbz2-1.0.8-r1 @@ -147,7 +147,7 @@ libcap-2.50-r0 libcap-ng-0.8.2-r0 libcap-ng-dev-0.8.2-r0 libcom_err-1.46.2-r0 -libcrypto1.1-1.1.1l-r0 +libcrypto1.1-1.1.1n-r0 libcurl-7.79.1-r0 libdrm-2.4.106-r0 libeconf-0.3.8-r1 @@ -157,12 +157,12 @@ libelf-0.182-r1 libelf-static-0.182-r1 libepoxy-1.5.8-r0 libevent-2.1.12-r2 -libfdisk-2.37-r0 +libfdisk-2.37.4-r0 libfdt-1.6.1-r0 libffi-3.3-r2 libgcc-10.3.1_git20210424-r2 libgcrypt-1.9.4-r0 -libgmpxx-6.2.1-r0 +libgmpxx-6.2.1-r1 libgomp-10.3.1_git20210424-r2 libgpg-error-1.42-r0 libgphobos-10.3.1_git20210424-r2 @@ -176,24 +176,24 @@ libltdl-2.4.6-r7 libmagic-5.40-r1 libmd-1.0.3-r0 libmnl-1.0.4-r1 -libmount-2.37-r0 +libmount-2.37.4-r0 libnfsidmap-2.5.3-r0 libnftnl-libs-1.2.0-r0 libnl3-3.5.0-r0 libpcap-1.10.0-r0 libpng-1.6.37-r1 -libressl-dev-3.3.3-r0 -libressl3.3-libcrypto-3.3.3-r0 -libressl3.3-libssl-3.3.3-r0 -libressl3.3-libtls-3.3.3-r0 +libressl-dev-3.3.6-r0 +libressl3.3-libcrypto-3.3.6-r0 +libressl3.3-libssl-3.3.6-r0 +libressl3.3-libtls-3.3.6-r0 libretls-3.3.3p1-r2 libsasl-2.1.27-r12 libseccomp-2.5.1-r2 libseccomp-dev-2.5.1-r2 libseccomp-static-2.5.1-r2 libsecret-0.20.4-r1 -libsmartcols-2.37-r0 -libssl1.1-1.1.1l-r0 +libsmartcols-2.37.4-r0 +libssl1.1-1.1.1n-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtirpc-1.3.2-r0 @@ -204,34 +204,34 @@ libtool-2.4.6-r7 libucontext-1.1-r0 libunistring-0.9.10-r1 libusb-1.0.24-r2 -libuuid-2.37-r0 +libuuid-2.37.4-r0 libuv-1.41.0-r0 libverto-0.3.2-r0 -libwbclient-4.14.8-r0 +libwbclient-4.14.12-r0 libx11-1.7.2-r0 libxau-1.0.9-r0 libxcb-1.14-r2 libxdmcp-1.1.3-r0 libxkbcommon-1.2.1-r0 -libxml2-2.9.12-r1 +libxml2-2.9.13-r0 linux-headers-5.10.41-r0 llvm11-11.1.0-r2 llvm11-dev-11.1.0-r2 llvm11-libs-11.1.0-r2 llvm11-static-11.1.0-r2 -logger-2.37-r0 -lsblk-2.37-r0 +logger-2.37.4-r0 +lsblk-2.37.4-r0 lsscsi-0.32-r0 lua5.3-libs-5.3.6-r0 lvm2-2.02.187-r1 lvm2-libs-2.02.187-r1 lvm2-openrc-2.02.187-r1 -lz4-libs-1.9.3-r0 +lz4-libs-1.9.3-r1 lzip-1.22-r0 lzo-2.10-r2 m4-1.4.18-r2 make-4.3-r0 -mcookie-2.37-r0 +mcookie-2.37.4-r0 mesa-21.1.2-r0 mesa-gbm-21.1.2-r0 mpc1-1.2.1-r0 @@ -268,10 +268,10 @@ openssh-client-default-8.6_p1-r3 openssh-keygen-8.6_p1-r3 openssh-server-8.6_p1-r3 openssh-server-common-8.6_p1-r3 -openssl-1.1.1l-r0 -openssl-dev-1.1.1l-r0 +openssl-1.1.1n-r0 +openssl-dev-1.1.1n-r0 p11-kit-0.23.22-r0 -partx-2.37-r0 +partx-2.37.4-r0 patch-2.7.6-r7 pcre-8.44-r0 pcre2-10.36-r0 @@ -285,7 +285,7 @@ pixman-0.40.0-r2 pkgconf-1.7.4-r0 popt-1.18-r0 python2-2.7.18-r2 -python3-3.9.5-r1 +python3-3.9.5-r2 qemu-6.0.0-r5 qemu-aarch64-6.0.0-r5 qemu-arm-6.0.0-r5 @@ -302,11 +302,11 @@ rpcbind-openrc-1.2.6-r0 rsync-3.2.3-r4 rsync-openrc-3.2.3-r4 s6-ipcserver-2.10.0.3-r0 -samba-util-libs-4.14.8-r0 +samba-util-libs-4.14.12-r0 scanelf-1.3.2-r0 sed-4.8-r0 -setpriv-2.37-r0 -sfdisk-2.37-r0 +setpriv-2.37.4-r0 +sfdisk-2.37.4-r0 sg3_utils-1.45-r0 sgdisk-1.0.8-r0 skalibs-2.10.0.3-r0 @@ -317,8 +317,8 @@ sntpc-0.9-r7 sntpc-openrc-0.9-r7 socat-1.7.4.1-r1 sqlite-libs-3.35.5-r0 -squashfs-tools-4.5-r0 -ssl_client-1.33.1-r3 +squashfs-tools-4.5-r1 +ssl_client-1.33.1-r6 swig-4.0.2-r2 talloc-2.3.2-r1 tar-1.34-r0 @@ -326,18 +326,18 @@ tcl-8.6.10-r1 tcpdump-4.99.0-r0 tevent-0.10.2-r1 tini-0.19.0-r0 -tzdata-2021e-r0 +tzdata-2022a-r0 udev-init-scripts-34-r0 udev-init-scripts-openrc-34-r0 userspace-rcu-0.12.2-r0 -util-linux-2.37-r0 -util-linux-dev-2.37-r0 -util-linux-openrc-2.37-r0 +util-linux-2.37.4-r0 +util-linux-dev-2.37.4-r0 +util-linux-openrc-2.37.4-r0 utmps-0.1.0.2-r0 utmps-openrc-0.1.0.2-r0 -uuidgen-2.37-r0 +uuidgen-2.37.4-r0 vde2-libs-2.3.2-r13 -vim-8.2.3437-r0 +vim-8.2.4173-r0 virglrenderer-0.8.2-r1 wayland-libs-server-1.19.0-r0 wireguard-tools-1.0.20210424-r0 @@ -350,7 +350,7 @@ xfsprogs-5.12.0-r0 xfsprogs-extra-5.12.0-r0 xkeyboard-config-2.33-r0 xorriso-1.5.4-r0 -xxd-8.2.3437-r0 +xxd-8.2.4173-r0 xz-5.2.5-r0 xz-dev-5.2.5-r0 xz-libs-5.2.5-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 8f09c8aa6..b20f1163c 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:d16ba10bd0430d48b57566754325215e5dd10865-amd64 +# linuxkit/alpine:c9b0f6a435b663b98952d67f4c6f105c310d0a21-amd64 # automatically generated list of installed packages abuild-3.8.0_rc4-r0 alpine-baselayout-3.2.0-r16 @@ -18,7 +18,7 @@ bc-1.07.1-r1 binutils-2.35.2-r2 binutils-dev-2.35.2-r2 bison-3.7.6-r0 -blkid-2.37-r0 +blkid-2.37.4-r0 bridge-utils-1.7.1-r0 brotli-libs-1.0.9-r5 bsd-compat-headers-0.7.2-r3 @@ -26,13 +26,13 @@ btrfs-progs-5.12.1-r0 btrfs-progs-dev-5.12.1-r0 btrfs-progs-libs-5.12.1-r0 build-base-0.5-r2 -busybox-1.33.1-r3 +busybox-1.33.1-r6 busybox-initscripts-3.3-r1 bzip2-1.0.8-r1 -ca-certificates-20191127-r5 -ca-certificates-bundle-20191127-r5 +ca-certificates-20211220-r0 +ca-certificates-bundle-20211220-r0 cdrkit-1.1.11-r3 -cfdisk-2.37-r0 +cfdisk-2.37.4-r0 cifs-utils-6.13-r0 clang-11.1.0-r1 clang-dev-11.1.0-r1 @@ -41,9 +41,9 @@ clang-libs-11.1.0-r1 clang-static-11.1.0-r1 cmake-3.20.3-r0 coreutils-8.32-r2 -cryptsetup-2.3.6-r0 -cryptsetup-libs-2.3.6-r0 -cryptsetup-openrc-2.3.6-r0 +cryptsetup-2.3.7-r0 +cryptsetup-libs-2.3.7-r0 +cryptsetup-openrc-2.3.7-r0 curl-7.79.1-r0 dbus-libs-1.12.20-r2 device-mapper-2.02.187-r1 @@ -64,16 +64,16 @@ ethtool-5.12-r0 eudev-3.2.10-r0 eudev-libs-3.2.10-r0 eudev-openrc-3.2.10-r0 -expat-2.4.1-r0 +expat-2.4.7-r0 expect-5.45.4-r0 fakeroot-1.25.3-r3 file-5.40-r1 -findmnt-2.37-r0 +findmnt-2.37.4-r0 findutils-4.8.0-r1 flex-2.6.4-r2 flex-dev-2.6.4-r2 flex-libs-2.6.4-r2 -flock-2.37-r0 +flock-2.37.4-r0 fortify-headers-1.1-r1 fts-1.2.7-r1 fts-dev-1.2.7-r1 @@ -89,15 +89,15 @@ gettext-libs-0.21-r0 git-2.32.0-r0 git-perl-2.32.0-r0 glib-2.68.3-r0 -gmp-6.2.1-r0 -gmp-dev-6.2.1-r0 +gmp-6.2.1-r1 +gmp-dev-6.2.1-r1 gnupg-2.2.31-r0 gnutls-3.7.1-r0 go-1.16.10-r0 grep-3.7-r0 guile-3.0.6-r0 guile-libs-3.0.6-r0 -hexdump-2.37-r0 +hexdump-2.37.4-r0 hvtools-4.11.9-r1 ifupdown-ng-0.11.3-r0 ifupdown-ng-ethtool-0.11.3-r0 @@ -132,12 +132,12 @@ krb5-server-ldap-1.18.4-r0 lddtree-1.26-r2 libacl-2.2.53-r0 libaio-0.3.112-r1 -libarchive-3.5.1-r0 -libarchive-tools-3.5.1-r0 +libarchive-3.5.2-r0 +libarchive-tools-3.5.2-r0 libassuan-2.5.5-r0 libatomic-10.3.1_git20210424-r2 libattr-2.5.1-r0 -libblkid-2.37-r0 +libblkid-2.37.4-r0 libbsd-0.11.3-r0 libburn-1.5.4-r0 libbz2-1.0.8-r1 @@ -148,7 +148,7 @@ libcap-2.50-r0 libcap-ng-0.8.2-r0 libcap-ng-dev-0.8.2-r0 libcom_err-1.46.2-r0 -libcrypto1.1-1.1.1l-r0 +libcrypto1.1-1.1.1n-r0 libcurl-7.79.1-r0 libdrm-2.4.106-r0 libeconf-0.3.8-r1 @@ -158,12 +158,12 @@ libelf-0.182-r1 libelf-static-0.182-r1 libepoxy-1.5.8-r0 libevent-2.1.12-r2 -libfdisk-2.37-r0 +libfdisk-2.37.4-r0 libfdt-1.6.1-r0 libffi-3.3-r2 libgcc-10.3.1_git20210424-r2 libgcrypt-1.9.4-r0 -libgmpxx-6.2.1-r0 +libgmpxx-6.2.1-r1 libgomp-10.3.1_git20210424-r2 libgpg-error-1.42-r0 libgphobos-10.3.1_git20210424-r2 @@ -177,7 +177,7 @@ libltdl-2.4.6-r7 libmagic-5.40-r1 libmd-1.0.3-r0 libmnl-1.0.4-r1 -libmount-2.37-r0 +libmount-2.37.4-r0 libmspack-0.10.1_alpha-r0 libnfsidmap-2.5.3-r0 libnftnl-libs-1.2.0-r0 @@ -185,18 +185,18 @@ libnl3-3.5.0-r0 libpcap-1.10.0-r0 libpciaccess-0.16-r0 libpng-1.6.37-r1 -libressl-dev-3.3.3-r0 -libressl3.3-libcrypto-3.3.3-r0 -libressl3.3-libssl-3.3.3-r0 -libressl3.3-libtls-3.3.3-r0 +libressl-dev-3.3.6-r0 +libressl3.3-libcrypto-3.3.6-r0 +libressl3.3-libssl-3.3.6-r0 +libressl3.3-libtls-3.3.6-r0 libretls-3.3.3p1-r2 libsasl-2.1.27-r12 libseccomp-2.5.1-r2 libseccomp-dev-2.5.1-r2 libseccomp-static-2.5.1-r2 libsecret-0.20.4-r1 -libsmartcols-2.37-r0 -libssl1.1-1.1.1l-r0 +libsmartcols-2.37.4-r0 +libssl1.1-1.1.1n-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtirpc-1.3.2-r0 @@ -210,23 +210,23 @@ libunistring-0.9.10-r1 libunwind-1.5.0-r1 libunwind-dev-1.5.0-r1 libusb-1.0.24-r2 -libuuid-2.37-r0 +libuuid-2.37.4-r0 libuv-1.41.0-r0 libverto-0.3.2-r0 -libwbclient-4.14.8-r0 +libwbclient-4.14.12-r0 libx11-1.7.2-r0 libxau-1.0.9-r0 libxcb-1.14-r2 libxdmcp-1.1.3-r0 libxkbcommon-1.2.1-r0 -libxml2-2.9.12-r1 +libxml2-2.9.13-r0 linux-headers-5.10.41-r0 llvm11-11.1.0-r2 llvm11-dev-11.1.0-r2 llvm11-libs-11.1.0-r2 llvm11-static-11.1.0-r2 -logger-2.37-r0 -lsblk-2.37-r0 +logger-2.37.4-r0 +lsblk-2.37.4-r0 lsscsi-0.32-r0 lua5.3-libs-5.3.6-r0 luajit-2.1_p20210510-r0 @@ -234,12 +234,12 @@ luajit-dev-2.1_p20210510-r0 lvm2-2.02.187-r1 lvm2-libs-2.02.187-r1 lvm2-openrc-2.02.187-r1 -lz4-libs-1.9.3-r0 +lz4-libs-1.9.3-r1 lzip-1.22-r0 lzo-2.10-r2 m4-1.4.18-r2 make-4.3-r0 -mcookie-2.37-r0 +mcookie-2.37.4-r0 mesa-21.1.2-r0 mesa-gbm-21.1.2-r0 mkinitfs-3.5.0-r0 @@ -283,11 +283,11 @@ openssh-client-default-8.6_p1-r3 openssh-keygen-8.6_p1-r3 openssh-server-8.6_p1-r3 openssh-server-common-8.6_p1-r3 -openssl-1.1.1l-r0 -openssl-dev-1.1.1l-r0 +openssl-1.1.1n-r0 +openssl-dev-1.1.1n-r0 ovmf-0.0.202011-r1 p11-kit-0.23.22-r0 -partx-2.37-r0 +partx-2.37.4-r0 patch-2.7.6-r7 pcre-8.44-r0 pcre2-10.36-r0 @@ -301,7 +301,7 @@ pixman-0.40.0-r2 pkgconf-1.7.4-r0 popt-1.18-r0 python2-2.7.18-r2 -python3-3.9.5-r1 +python3-3.9.5-r2 qemu-6.0.0-r5 qemu-aarch64-6.0.0-r5 qemu-arm-6.0.0-r5 @@ -317,11 +317,11 @@ rpcbind-openrc-1.2.6-r0 rsync-3.2.3-r4 rsync-openrc-3.2.3-r4 s6-ipcserver-2.10.0.3-r0 -samba-util-libs-4.14.8-r0 +samba-util-libs-4.14.12-r0 scanelf-1.3.2-r0 sed-4.8-r0 -setpriv-2.37-r0 -sfdisk-2.37-r0 +setpriv-2.37.4-r0 +sfdisk-2.37.4-r0 sg3_utils-1.45-r0 sgdisk-1.0.8-r0 skalibs-2.10.0.3-r0 @@ -332,8 +332,8 @@ sntpc-0.9-r7 sntpc-openrc-0.9-r7 socat-1.7.4.1-r1 sqlite-libs-3.35.5-r0 -squashfs-tools-4.5-r0 -ssl_client-1.33.1-r3 +squashfs-tools-4.5-r1 +ssl_client-1.33.1-r6 strace-5.12-r0 swig-4.0.2-r2 syslinux-6.04_pre1-r9 @@ -343,18 +343,18 @@ tcl-8.6.10-r1 tcpdump-4.99.0-r0 tevent-0.10.2-r1 tini-0.19.0-r0 -tzdata-2021e-r0 +tzdata-2022a-r0 udev-init-scripts-34-r0 udev-init-scripts-openrc-34-r0 userspace-rcu-0.12.2-r0 -util-linux-2.37-r0 -util-linux-dev-2.37-r0 -util-linux-openrc-2.37-r0 +util-linux-2.37.4-r0 +util-linux-dev-2.37.4-r0 +util-linux-openrc-2.37.4-r0 utmps-0.1.0.2-r0 utmps-openrc-0.1.0.2-r0 -uuidgen-2.37-r0 +uuidgen-2.37.4-r0 vde2-libs-2.3.2-r13 -vim-8.2.3437-r0 +vim-8.2.4173-r0 virglrenderer-0.8.2-r1 wayland-libs-server-1.19.0-r0 wireguard-tools-1.0.20210424-r0 @@ -367,7 +367,7 @@ xfsprogs-5.12.0-r0 xfsprogs-extra-5.12.0-r0 xkeyboard-config-2.33-r0 xorriso-1.5.4-r0 -xxd-8.2.3437-r0 +xxd-8.2.4173-r0 xz-5.2.5-r0 xz-dev-5.2.5-r0 xz-libs-5.2.5-r0 diff --git a/tools/containerd-dev/Dockerfile b/tools/containerd-dev/Dockerfile new file mode 100644 index 000000000..d347aed37 --- /dev/null +++ b/tools/containerd-dev/Dockerfile @@ -0,0 +1,29 @@ +FROM linuxkit/alpine:5d89cd05a567f9bfbe4502be1027a422d46f4a75 as builder + + +# checkout and compile containerd +# Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and +# `test/pkg/containerd/Dockerfile` when changing this. +# when building, note that containerd does not use go modules in the below commit, +# while go1.16 defaults to using it, so must disable with GO111MODULE=off +ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git +ENV CONTAINERD_COMMIT=v1.6.1 +ENV GOPATH=/go +RUN apk add go git +RUN mkdir -p $GOPATH/src/github.com/containerd && \ + cd $GOPATH/src/github.com/containerd && \ + git clone https://github.com/containerd/containerd.git && \ + cd $GOPATH/src/github.com/containerd/containerd && \ + git checkout $CONTAINERD_COMMIT +RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make libseccomp-dev +WORKDIR $GOPATH/src/github.com/containerd/containerd +RUN GO111MODULE=off make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper" + +RUN cp bin/containerd bin/ctr bin/containerd-shim bin/containerd-shim-runc-v2 /usr/bin/ +RUN strip /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2 + +FROM scratch +ENTRYPOINT [] +WORKDIR / +COPY --from=builder /usr/bin/containerd /usr/bin/ctr /usr/bin/containerd-shim /usr/bin/containerd-shim-runc-v2 /usr/bin/ +COPY --from=builder /go/src/github.com/containerd/containerd /go/src/github.com/containerd/containerd diff --git a/tools/containerd-dev/build.yml b/tools/containerd-dev/build.yml new file mode 100644 index 000000000..e6b676b93 --- /dev/null +++ b/tools/containerd-dev/build.yml @@ -0,0 +1,2 @@ +image: containerd-dev +network: true