docker: updated to version 20.10.2

3 files changed, 24 insertions, 25 deletions

diff --git a/docker/.footprint b/docker/.footprint
index b7f797e84..39cb34206 100644
--- a/docker/.footprint
+++ b/docker/.footprint
@@ -73,12 +73,7 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/docker-context.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-cp.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-create.1.gz
--rw-r--r--	root/root	usr/share/man/man1/docker-deploy.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-diff.1.gz
--rw-r--r--	root/root	usr/share/man/man1/docker-engine-activate.1.gz
--rw-r--r--	root/root	usr/share/man/man1/docker-engine-check.1.gz
--rw-r--r--	root/root	usr/share/man/man1/docker-engine-update.1.gz
--rw-r--r--	root/root	usr/share/man/man1/docker-engine.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-events.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-exec.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-export.1.gz
@@ -109,6 +104,7 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/docker-manifest-create.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-manifest-inspect.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-manifest-push.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/docker-manifest-rm.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-manifest.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-network-connect.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/docker-network-create.1.gz
diff --git a/docker/.signature b/docker/.signature
index 1fb6e471a..b783c9225 100644
--- a/docker/.signature
+++ b/docker/.signature
@@ -1,9 +1,10 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31PNV656X9EY2E/twfdMJrTMTwG0Cf4FpNipzYL/7OWsWgjniNOYx0GGvKtFDs4wl6za1vI1OSeq5WprHseIwAs=
-SHA256 (Pkgfile) = 957e2d0fc59a64644aed21469b0fca8b206f2322b086133ab2e758601bc5f828
-SHA256 (.footprint) = bb919844c882663bd9d47875128ebc9d9e52ca3b569ea271d4b990fff980820a
-SHA256 (docker-ce-v19.03.14.tar.gz) = 0b8838b0da1f1368fc1a0809a2ed11840bd7d58df1f090e668de209faddcef7c
-SHA256 (docker-man-pages-19.03.14.tar.xz) = 523b41abf8bd22a966d30e6aa77173cc72f78fe51b7caf91a8e7f9794245b284
-SHA256 (libnetwork-55e924b.tar.xz) = 6990454342d57a72b6f5ca913d9a1f13f0390f757a9c2aa28a0faebd2e633de0
+RWSagIOpLGJF3w/j2/gS5+uMMqdut9gFdF5gKMhUKkW0r5tK7Hu/jf8ifj1wXsqF6T/6Y/SaLKbmhaYMW0XK6xD2w+Yu1ENhzQc=
+SHA256 (Pkgfile) = 552b0ec3b599719cf42496f4ea969ebc0ef61e3a8b6e76ab2623ea1b55a1b14d
+SHA256 (.footprint) = ef891bf504df63f9b4413ecccd3a0ce6e4a71b1a42f22e9bb9c36a6a87a2c3fe
+SHA256 (moby-20.10.2.tar.gz) = dc4818f0cba2ded2f6f7420a1fda027ddbf6c6c9fe319f84d1311bfe610447ca
+SHA256 (cli-20.10.2.tar.gz) = a663f54a158c6b2b23b253b14bf0de56ff035750098e760319de1edb7f4ae76d
+SHA256 (docker-man-pages-20.10.2.tar.xz) = ac21f22c2b75d83bba8b662f177d26bb00d3bf7d15160560cd215a127d85ff49
+SHA256 (libnetwork-fa125a3.tar.xz) = 10b51ec4c7048369b92a4f7992ab1a559ba053feb32da6bc69bd69d089c361c2
 SHA256 (docker.rc) = 258ff4d10d199b2b847df07d22eac04bb8bd749a10af29d67111e53a8b81a46c
 SHA256 (docker.conf) = 51f264d548d6d3871d07670e7e5ba6414c3b4317dcc6d59cd7cc45dc1045659e
diff --git a/docker/Pkgfile b/docker/Pkgfile
index d6229ec7b..1a49811cd 100644
--- a/docker/Pkgfile
+++ b/docker/Pkgfile
@@ -3,44 +3,46 @@
 # Maintainer: Matt Housh, jaeger at crux dot ninja
 # Depends on: containerd runc btrfs-progs cgroupfs-mount
 
+# LIBNETWORK_COMMIT:=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
 name=docker
-version=19.03.14
+version=20.10.2
 release=1
-source=(https://github.com/docker/docker-ce/archive/v$version/$name-ce-v$version.tar.gz \
+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-55e924b.tar.xz \
+    http://jaeger.morpheus.net/linux/crux/files/libnetwork-fa125a3.tar.xz \
     $name.rc $name.conf)
 
 build() {
     export GOPATH=$SRC
-    export DOCKER_GITCOMMIT=5eb3275
+    export DOCKER_GITCOMMIT=8891c58
     export DOCKER_BUILDTAGS='seccomp'
     export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
     mkdir -p src/github.com/docker
 
     pushd src/github.com/docker
-    ln -s $SRC/$name-ce-$version/components/cli
+    ln -s $SRC/cli-$version cli
     pushd cli
     make VERSION=$version dynbinary
     popd
     popd
 
     pushd src/github.com/docker
-    ln -s $SRC/$name-ce-$version/components/engine $name
-    pushd $name
+    ln -s $SRC/moby-$version docker
+    pushd docker
     VERSION=$version hack/make.sh dynbinary
     popd
     popd
 
-    cd $name-ce-$version
-    install -D -m 0755 components/cli/build/$name $PKG/usr/bin/$name
-    install -D -m 0755 components/engine/bundles/dynbinary-daemon/dockerd-$version \
+    install -D -m 0755 cli-$version/build/$name $PKG/usr/bin/$name
+    install -D -m 0755 moby-$version/bundles/dynbinary-daemon/dockerd-$version \
         $PKG/usr/bin/dockerd
 
     (cd ..; \
         GOROOT=/usr/lib/go GOPATH=${PKGMK_WORK_DIR} go build -o $PKG/usr/bin/$name-proxy \
-            libnetwork-55e924b/cmd/proxy)
+            libnetwork-fa125a3/cmd/proxy)
 
     for M in 1 5 8; do
         install -d -m 0755 $PKG/usr/share/man/man${M}
@@ -57,10 +59,10 @@ build() {
     ln -s ctr $PKG/usr/bin/docker-containerd-ctr
     ln -s runc $PKG/usr/bin/docker-runc
 
-    install -D -m 0755 components/engine/contrib/check-config.sh \
+    install -D -m 0755 moby-$version/contrib/check-config.sh \
         $PKG/usr/share/$name/check-config.sh
-    install -D -m 0644 components/engine/contrib/udev/80-$name.rules \
+    install -D -m 0644 moby-$version/contrib/udev/80-$name.rules \
         $PKG/etc/udev/rules.d/80-$name.rules
-    install -D -m 0644 components/cli/contrib/completion/bash/docker \
+    install -D -m 0644 cli-$version/contrib/completion/bash/docker \
         $PKG/etc/bash_completion.d/docker
 }