docker: downgrade to v20.10.23 (#15233)

We had to revert docker back to v20.10.23 since the v23.0.x versions were breaking the way containerd was reading the configuration and this results in containerd not being able to correctly start up.

root-packages/docker/build.sh

@@ -2,12 +2,17 @@ TERMUX_PKG_HOMEPAGE=https://docker.com
 TERMUX_PKG_DESCRIPTION="Set of products that use OS-level virtualization to deliver software in packages called containers."
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=23.0.1
-DOCKER_GITCOMMIT=a5ee5b1
-TERMUX_PKG_SRCURL=(https://github.com/moby/moby/archive/v${TERMUX_PKG_VERSION}.tar.gz
-                   https://github.com/docker/cli/archive/v${TERMUX_PKG_VERSION}.tar.gz)
-TERMUX_PKG_SHA256=(c8e6c0ac5f0c772023e3430f80190e0f86644b6d94cac63118b03561385f7b56
-                   37bc1c71a782fc10d35aa6708c1b3c90a71f3947c33665cb0de68df25dc14d94)
+# v20.10.23 is the last version confirmed to work.
+# Do not update it unless you tested it on your device.
+TERMUX_PKG_VERSION=1:20.10.23
+LIBNETWORK_COMMIT=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
+DOCKER_GITCOMMIT=7155243
+TERMUX_PKG_SRCURL=(https://github.com/moby/moby/archive/v${TERMUX_PKG_VERSION:2}.tar.gz
+                   https://github.com/docker/cli/archive/v${TERMUX_PKG_VERSION:2}.tar.gz
+                   https://github.com/moby/libnetwork/archive/${LIBNETWORK_COMMIT}.tar.gz)
+TERMUX_PKG_SHA256=(61bb3f4f0c935ac9a719adbac69fca0d727b6b5c3eb889571e00b1cc3ff1e368
+                   55563b87050ce7b9b2124a9b882fdef4fa17e23f431ad502c8227101d5e789fd
+                   5c5e3aa7599e85036438a65016796aa11df4afb44d13b5927dcfb0ec5947a86b)
 TERMUX_PKG_DEPENDS="containerd, libdevmapper"
 TERMUX_PKG_CONFFILES="etc/docker/daemon.json"
 TERMUX_PKG_BUILD_IN_SRC=true
@@ -77,14 +82,14 @@ termux_step_make() {
 
 	# fix path locations to build with go
 	mkdir -p go/src/github.com/docker
-	mv -T moby go/src/github.com/docker/docker
-	mkdir moby
-	mv go moby
-	export GOPATH="${PWD}/moby/go"
-	cd "${GOPATH}/src/github.com/docker/docker"
+	mv libnetwork go/src/github.com/docker
+	mkdir libnetwork
+	mv go libnetwork
+	export GOPATH="${PWD}/libnetwork/go"
+	cd "${GOPATH}/src/github.com/docker/libnetwork"
 
 	# issue the build command
-	go build -o docker-proxy github.com/docker/docker/cmd/docker-proxy
+	go build -o docker-proxy github.com/docker/libnetwork/cmd/proxy
 	)
 	echo " Done!"
 
@@ -116,8 +121,8 @@ termux_step_make() {
 }
 
 termux_step_make_install() {
-	install -Dm 700 moby/go/src/github.com/docker/docker/bundles/dynbinary-daemon/dockerd ${TERMUX_PREFIX}/libexec/dockerd
-	install -Dm 700 moby/go/src/github.com/docker/docker/docker-proxy ${TERMUX_PREFIX}/bin/docker-proxy
+	install -Dm 700 moby/bundles/dynbinary-daemon/dockerd ${TERMUX_PREFIX}/libexec/dockerd
+	install -Dm 700 libnetwork/go/src/github.com/docker/libnetwork/docker-proxy ${TERMUX_PREFIX}/bin/docker-proxy
 	install -Dm 700 cli/go/src/github.com/docker/cli/build/docker-android-* ${TERMUX_PREFIX}/bin/docker
 	install -Dm 600 -t ${TERMUX_PREFIX}/share/man/man1 cli/go/src/github.com/docker/cli/man/man1/*
 	install -Dm 600 -t ${TERMUX_PREFIX}/share/man/man5 cli/go/src/github.com/docker/cli/man/man5/*

root-packages/docker/config.go.patch

@@ -35,6 +35,6 @@
  	// Can't find latest config file so check for the old one
 -	filename = filepath.Join(getHomeDir(), oldConfigfile)
 +	filename = filepath.Join("@TERMUX_HOME@/.docker", oldConfigfile)
- 	if _, err := os.Stat(filename); err == nil {
+ 	if file, err := os.Open(filename); err == nil {
  		printLegacyFileWarning = true
- 	}
+ 		defer file.Close()

root-packages/docker/generate-man.sh.patch

@@ -1,27 +1,18 @@
 --- ./cli/scripts/docs/generate-man.sh.orig	2021-12-05 15:26:07.599604265 +0100
 +++ ./cli/scripts/docs/generate-man.sh	2021-12-05 15:28:20.809486509 +0100
-@@ -26,13 +26,13 @@
-   # update vendor
-   ./scripts/vendor update
-   # build gen-manpages
--  go build -mod=vendor -modfile=vendor.mod -tags manpages -o /tmp/gen-manpages ./man/generate.go
-+  go build -mod=vendor -modfile=vendor.mod -tags manpages -o build/gen-manpages ./man/generate.go
-   # build go-md2man
--  go build -mod=vendor -modfile=vendor.mod -o /tmp/go-md2man ./vendor/github.com/cpuguy83/go-md2man/v2
-+  go build -mod=vendor -modfile=vendor.mod -o build/go-md2man ./vendor/github.com/cpuguy83/go-md2man/v2
- )
+@@ -6,12 +6,12 @@
  
- mkdir -p man/man1
--(set -x ; /tmp/gen-manpages --root "." --target "$(pwd)/man/man1")
-+(set -x ; "$buildir"/build/gen-manpages --root "." --target "$(pwd)/man/man1")
+ if ! command -v go-md2man &> /dev/null; then
+ 	# yay, go install creates a binary named "v2" ¯\_(ツ)_/¯
+-	go build -o "/go/bin/go-md2man" ./vendor/github.com/cpuguy83/go-md2man/v2
++	go build -o "build/go-md2man" ./vendor/github.com/cpuguy83/go-md2man/v2
+ fi
  
- (
-   cd man
-@@ -45,6 +45,6 @@
-       continue
-     fi
-     mkdir -p "./man${num}"
--    (set -x ; /tmp/go-md2man -in "$FILE" -out "./man${num}/${name}")
-+    (set -x ; "$buildir"/build/go-md2man -in "$FILE" -out "./man${num}/${name}")
-   done
- )
+ # Generate man pages from cobra commands
+-go build -o /tmp/gen-manpages github.com/docker/cli/man
+-/tmp/gen-manpages --root "$(pwd)" --target "$(pwd)/man/man1"
++go build -o build/gen-manpages github.com/docker/cli/man
++build/gen-manpages --root "$(pwd)" --target "$(pwd)/man/man1"
+ 
+ # Generate legacy pages from markdown
+ ./man/md2man-all.sh -q

root-packages/docker/md2man-all.sh.patch

@@ -0,0 +1,9 @@
+--- ./cli/man/md2man-all.sh.orig	2021-12-05 15:29:36.176056012 +0100
++++ ./cli/man/md2man-all.sh	2021-12-05 15:33:54.339101972 +0100
+@@ -18,5 +18,5 @@
+ 		continue
+ 	fi
+ 	mkdir -p "./man${num}"
+-	go-md2man -in "$FILE" -out "./man${num}/${name}"
++	../build/go-md2man -in "$FILE" -out "./man${num}/${name}"
+ done