From f6102eba4d9207bafc42fe0bf87303e663f23d4b Mon Sep 17 00:00:00 2001 From: Matt Housh Date: Fri, 14 Oct 2022 12:05:19 -0500 Subject: [PATCH] docker: updated to version 20.10.19 --- docker/.signature | 12 ++++++------ docker/Pkgfile | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docker/.signature b/docker/.signature index b7fd16926..cc89e895e 100644 --- a/docker/.signature +++ b/docker/.signature @@ -1,10 +1,10 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF361EIT54ZEZvHe6xhVPMl+/TR5ARB8crIw5czmMrSnZ8pwurC7NSoOjIx+UVzIAtdiv8T+A5hGNsisWQtRXvwwY= -SHA256 (Pkgfile) = 28ee1ee7f93b52c388bcba6e0e5fe54de2f7a1c30261e158fb4bbf8535e3bed8 +RWSagIOpLGJF3wKyt2SR0VczYJSTxTNGHcvPHdrW3CjKvp11iGNM7IYYyA0f/tBwvjGbWyYMr/G5V6L9A0C5pWCdfb9NJuPFggg= +SHA256 (Pkgfile) = fdcbc34c983853f6af5f63f84389193ddc25ada375518fffbb00a8dc58ecec91 SHA256 (.footprint) = ef891bf504df63f9b4413ecccd3a0ce6e4a71b1a42f22e9bb9c36a6a87a2c3fe -SHA256 (moby-20.10.18.tar.gz) = 9907aaaf39fb1c2c3fd427192e4a63d7adf8ddc9fb0e29c692a6ca10de9c34f6 -SHA256 (cli-20.10.18.tar.gz) = 87ba64f76d3bb98666fa44552c3eb0b1c10e5e9c43010e8dbc180ba22690413a -SHA256 (docker-man-pages-20.10.18.tar.xz) = 53ff1bbc59947a0edfee5198d793589b35a315838bb45c25c4e1703a882a1c36 -SHA256 (libnetwork-f6ccccb.tar.xz) = 7849aec7667e3a14e6da27b4e26a11c9d76756e624f812e7d9083f4b2938f0b8 +SHA256 (moby-20.10.19.tar.gz) = 228caadac1b37a5ba310eb25418cf1fdd8878336f1d8faf0a2daa87fcc577577 +SHA256 (cli-20.10.19.tar.gz) = f4398ad858274605f8e4e55d4618b2f5bdff6969a4afa232842bb2417d8a98db +SHA256 (docker-man-pages-20.10.19.tar.xz) = 701dd84bb7eaeab4cbdce2c8a9cfe3d1943b76ba5517146fb6f4f3208664bad1 +SHA256 (libnetwork-0dde5c8.tar.xz) = afd4aa7ad75aad83c42b706ad825ad5afe6fe6c694a4ce81c1bc6a75c32d0d29 SHA256 (docker.rc) = 258ff4d10d199b2b847df07d22eac04bb8bd749a10af29d67111e53a8b81a46c SHA256 (docker.conf) = 51f264d548d6d3871d07670e7e5ba6414c3b4317dcc6d59cd7cc45dc1045659e diff --git a/docker/Pkgfile b/docker/Pkgfile index 86a8e76b0..bebe70bce 100644 --- a/docker/Pkgfile +++ b/docker/Pkgfile @@ -3,21 +3,21 @@ # Maintainer: Matt Housh, jaeger at crux dot ninja # Depends on: containerd runc btrfs-progs cgroupfs-mount -# LIBNETWORK_COMMIT:=f6ccccb1c082a432c2a5814aaedaca56af33d9ea +# LIBNETWORK_COMMIT:=0dde5c895075df6e3630e76f750a447cf63f4789 name=docker -version=20.10.18 +version=20.10.19 release=1 source=(https://github.com/moby/moby/archive/v${version}/moby-${version}.tar.gz \ https://github.com/docker/cli/archive/v${version}/cli-${version}.tar.gz \ http://jaeger.morpheus.net/linux/crux/files/$name-man-pages-$version.tar.xz \ - http://jaeger.morpheus.net/linux/crux/files/libnetwork-f6ccccb.tar.xz \ + http://jaeger.morpheus.net/linux/crux/files/libnetwork-0dde5c8.tar.xz \ $name.rc $name.conf) build() { export GO111MODULE=auto export GOPATH=$SRC - export DOCKER_GITCOMMIT=e42327a + export DOCKER_GITCOMMIT=c964641 export DOCKER_BUILDTAGS='seccomp' export DISABLE_WARN_OUTSIDE_CONTAINER=1 @@ -43,7 +43,7 @@ build() { (cd ..; \ GOROOT=/usr/lib/go GOPATH=${PKGMK_WORK_DIR} go build -o $PKG/usr/bin/$name-proxy \ - libnetwork-f6ccccb/cmd/proxy) + libnetwork-0dde5c8/cmd/proxy) for M in 1 5 8; do install -d -m 0755 $PKG/usr/share/man/man${M}