From 5568e4557f62f9f716cd672cebe4cd3e5cef339f Mon Sep 17 00:00:00 2001 From: Matt Housh Date: Tue, 15 Jun 2021 20:59:39 -0500 Subject: [PATCH] docker: updated to version 20.10.7 --- docker/.signature | 12 ++++++------ docker/Pkgfile | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docker/.signature b/docker/.signature index 17c457e4d..32e97e727 100644 --- a/docker/.signature +++ b/docker/.signature @@ -1,10 +1,10 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35PMbUJ+EaE6FDhKJixrcoGtLcL2Jg67CnOQ5TRmBW5RfC248Qa+kB8+Vsh6XcYaqO7SJIW0cpJBa+RCwj15igg= -SHA256 (Pkgfile) = eeeed4365e7aa2e794e4f02b19694f02467d8666fbbdf4d3acb77e52396cca59 +RWSagIOpLGJF32OfE9Cd2lR8VCNT2bQi2Rk/XABV/m/JBbXvEdezH7NqO0Q72E5++Gz3zmxR/3TpsqDsCZJPzwOJTHpjZA/cPwI= +SHA256 (Pkgfile) = b17017a7889f4490dd0ba73b3091950b180213eaf182b08ec0eba09d9b17c77c SHA256 (.footprint) = ef891bf504df63f9b4413ecccd3a0ce6e4a71b1a42f22e9bb9c36a6a87a2c3fe -SHA256 (moby-20.10.6.tar.gz) = fd7f5571b1f64f26b5ca520a3e1fefb33c190f3732b931051c23a76bdba5000e -SHA256 (cli-20.10.6.tar.gz) = eda53b96ab83a59502df2e5e00ab7ee867243259407ef454be55e695303c1113 -SHA256 (docker-man-pages-20.10.6.tar.xz) = a0aea5a2bf87ddea9914e7429b0d94b0157dde08c559dc1c2f9f70b154c35283 -SHA256 (libnetwork-b350742.tar.xz) = 6dab4151b4fb0c75015466ce2ef49bd7a3c362d6d02735c524c5c68ca05134ce +SHA256 (moby-20.10.7.tar.gz) = b80142035de46904605fb7b8f18075cd94154f8c3d67ff346ea554d1e9d579b9 +SHA256 (cli-20.10.7.tar.gz) = 0a7848b1b5031483de075433506d0448ddf834368d9c73770e453e0b89b49747 +SHA256 (docker-man-pages-20.10.7.tar.xz) = 360f52eacd692c57f8ce307fcfc00a89ceb31ba1dccef8f454a24a43caf16291 +SHA256 (libnetwork-64b7a45.tar.xz) = 651e377825e8c0652678c10d7b8df10ab6adba8a43bf7fecce08203f7b0ed059 SHA256 (docker.rc) = 258ff4d10d199b2b847df07d22eac04bb8bd749a10af29d67111e53a8b81a46c SHA256 (docker.conf) = 51f264d548d6d3871d07670e7e5ba6414c3b4317dcc6d59cd7cc45dc1045659e diff --git a/docker/Pkgfile b/docker/Pkgfile index e3468beed..255e5acc2 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:=b3507428be5b458cb0e2b4086b13531fb0706e46 +# LIBNETWORK_COMMIT:=64b7a4574d1426139437d20e81c0b6d391130ec8 name=docker -version=20.10.6 +version=20.10.7 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-b350742.tar.xz \ + http://jaeger.morpheus.net/linux/crux/files/libnetwork-64b7a45.tar.xz \ $name.rc $name.conf) build() { export GO111MODULE=auto export GOPATH=$SRC - export DOCKER_GITCOMMIT=363e9a8 + export DOCKER_GITCOMMIT=b0f5bc3 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-b350742/cmd/proxy) + libnetwork-64b7a45/cmd/proxy) for M in 1 5 8; do install -d -m 0755 $PKG/usr/share/man/man${M}