Re: [PR PATCH] [Updated] docker: refactor, update, segment

[radiden <radiden@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is an updated pull request by radiden against master on the void-packages repository

https://github.com/endigma/void-packages master
https://github.com/void-linux/void-packages/pull/29326

docker: refactor, update, segment
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->



A patch file from https://github.com/void-linux/void-packages/pull/29326.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29326.patch --]
[-- Type: text/x-diff, Size: 10852 bytes --]

From cd8d424157622da2e50452ae56d7de12877fb8e1 Mon Sep 17 00:00:00 2001
From: rainyuu <gabriel2012688@googlemail.com>
Date: Tue, 16 Mar 2021 20:37:57 +0100
Subject: [PATCH] docker: split package, update to 20.10.5

New package: docker-cli-20.10.5
New package: moby-20.10.5
---
 srcpkgs/docker                                |   1 +
 srcpkgs/docker-cli/template                   |  30 ++++
 srcpkgs/docker-cli/update                     |   1 +
 srcpkgs/docker/template                       | 138 ------------------
 srcpkgs/docker/update                         |   1 -
 srcpkgs/{docker => moby}/files/docker/log/run |   0
 srcpkgs/{docker => moby}/files/docker/run     |   0
 srcpkgs/moby/template                         |  51 +++++++
 srcpkgs/moby/update                           |   1 +
 9 files changed, 84 insertions(+), 139 deletions(-)
 create mode 120000 srcpkgs/docker
 create mode 100644 srcpkgs/docker-cli/template
 create mode 100644 srcpkgs/docker-cli/update
 delete mode 100644 srcpkgs/docker/template
 delete mode 100644 srcpkgs/docker/update
 rename srcpkgs/{docker => moby}/files/docker/log/run (100%)
 rename srcpkgs/{docker => moby}/files/docker/run (100%)
 mode change 100755 => 100644
 create mode 100644 srcpkgs/moby/template
 create mode 100644 srcpkgs/moby/update

diff --git a/srcpkgs/docker b/srcpkgs/docker
new file mode 120000
index 000000000000..1f54c86ca232
--- /dev/null
+++ b/srcpkgs/docker
@@ -0,0 +1 @@
+docker-cli
\ No newline at end of file
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 000000000000..747f2c67ca81
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,30 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+wrksrc="cli-${version}"
+build_style=go
+go_package="github.com/docker/cli/cmd/docker"
+go_import_path="github.com/docker/cli"
+_cli_ver_path="github.com/docker/cli/cli/version"
+go_ldflags="-X \"${_cli_ver_path}.Version=${version}\"
+ -X \"${_cli_ver_path}.GitCommit=tag v${version}\""
+hostmakedepends="pkg-config"
+depends="git"
+short_desc="Command-line interface for the Docker daemon"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+pre_build() {
+	go_ldflags+=" -X \"${_cli_ver_path}.BuildTime=$(date +%Y-%m-%dT%H:%M:%SZ)\""
+}
+
+docker_package() {
+	build_style="meta"
+	short_desc="Docker container runtime"
+	depends="${sourcepkg}>=${version}_${revision} moby"
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 000000000000..2402ccb6eb59
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
deleted file mode 100644
index e0830515a33e..000000000000
--- a/srcpkgs/docker/template
+++ /dev/null
@@ -1,138 +0,0 @@
-# Template file for 'docker'
-pkgname=docker
-version=19.03.15
-revision=1
-create_wrksrc=yes
-build_style=go
-hostmakedepends="pkg-config cmake tar"
-makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel
- libapparmor-devel libltdl-devel"
-depends="containerd runc"
-short_desc="Pack, ship and run any application as a lightweight container"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Apache-2.0, MIT"
-homepage="http://www.docker.io"
-
-_tini_version=0.18.0
-_libnetwork="bump_${version%.${version#*.*.}}"
-
-distfiles="
- https://github.com/docker/docker-ce/archive/v${version}.tar.gz>docker-ce-$version.tar.gz
- https://github.com/krallin/tini/archive/v$_tini_version.tar.gz>tini-$_tini_version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork.tar.gz>libnetwork-$_libnetwork.tar.gz"
-checksum="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd
- 1097675352d6317b547e73f9dc7c6839fd0bb0d96dafc2e5c95506bb324049a2
- 753615b94b6a8e37a612f766870d9e2af7e17cae7820bc6104ba67b4c6c1109a"
-
-
-# These are required at run-time.
-depends+=" iptables xz git"
-nopie=yes
-nostrip=yes
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-system_groups="docker"
-
-do_configure() {
-	msg_normal "Configuring docker-init\n"
-	mkdir -p $wrksrc/tini-$_tini_version/build
-	cd $wrksrc/tini-$_tini_version/build
-	local cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None"
-
-	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
-		x86_64*)  _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*)     _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		*)        msg_error "BUG: $pkgver: unknown target machine\n" ;;
-		esac
-		cat >cross_${XBPS_CROSS_TRIPLET}.cmake <<-_EOF
-		SET(CMAKE_SYSTEM_NAME Linux)
-		SET(CMAKE_SYSTEM_VERSION 1)
-
-		SET(CMAKE_C_COMPILER   ${CC})
-		SET(CMAKE_CXX_COMPILER ${CXX})
-		SET(CMAKE_CROSSCOMPILING TRUE)
-
-		SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
-
-		SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
-
-		SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-		SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-		_EOF
-		cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
-	fi
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
-	cmake ${cmake_args} ..
-
-	mkdir -p $wrksrc/gopath/src/github.com/docker
-
-	msg_normal "Preparing docker-proxy import path\n"
-	cd $wrksrc/libnetwork-$_libnetwork
-	rm -f $wrksrc/gopath/src/github.com/docker/libnetwork
-	ln -s "$PWD" $wrksrc/gopath/src/github.com/docker/libnetwork
-
-	msg_normal "Preparing docker-cli import path\n"
-	cd $wrksrc/docker-ce-$version
-	rm -f $wrksrc/gopath/src/github.com/docker/cli
-	ln -s "$PWD/components/cli" $wrksrc/gopath/src/github.com/docker/cli
-	rm -f $wrksrc/gopath/src/github.com/docker/docker
-	ln -s "$PWD/components/engine" $wrksrc/gopath/src/github.com/docker/docker
-
-	BUILDTIME=$(date --utc --rfc-3339 ns)
-	BUILDTIME=${BUILDTIME/ /T}
-	vsed -i -e "
-		/GitCommit/s/\".*\"/\"v$version\"/;
-		/Version/s/\".*\"/\"$version\"/;
-		/BuildTime/s/\".*\"/\"$BUILDTIME\"/;
-	" \
-		components/engine/dockerversion/version_lib.go \
-		components/cli/cli/version/version.go
-}
-
-do_build() {
-	export GOPATH="$wrksrc/gopath"
-	mkdir -p $wrksrc/gopath/bin
-
-	msg_normal "Building docker-init\n"
-	cd $wrksrc/tini-$_tini_version/build
-	make tini-static
-
-	msg_normal "Building docker-proxy\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags -linkmode=external" \
-		-o $wrksrc/gopath/bin/docker-proxy \
-		github.com/docker/libnetwork/cmd/proxy
-
-	msg_normal "Building docker cli\n"
-	go build -buildmode=pie \
-		-ldflags="$go_ldflags" -o $wrksrc/gopath/bin/docker \
-		github.com/docker/cli/cmd/docker
-
-	msg_normal "Building docker daemon\n"
-	go build -buildmode=pie \
-		-tags 'libdm_dlsym_deferred_remove seccomp apparmor' \
-		-ldflags="$go_ldflags" \
-		-o $wrksrc/gopath/bin/dockerd \
-		github.com/docker/docker/cmd/dockerd
-}
-
-do_install() {
-	vbin tini-$_tini_version/build/tini-static docker-init
-	vlicense tini-$_tini_version/LICENSE docker-init.MIT
-	vbin gopath/bin/docker-proxy
-	vbin gopath/bin/docker
-	vbin gopath/bin/dockerd
-	cd docker-ce-$version
-	vcompletion components/cli/contrib/completion/bash/docker bash
-	vcompletion components/cli/contrib/completion/zsh/_docker zsh
-	vcompletion components/cli/contrib/completion/fish/docker.fish fish
-	vinstall components/engine/contrib/syntax/vim/syntax/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/syntax/dockerfile.vim
-	vinstall components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim 644 \
-		usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-	vlicense components/engine/contrib/syntax/vim/LICENSE dockerfile.vim.BSD-2-Clause
-	vsv docker
-}
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab517367..000000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/moby/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/moby/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/moby/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/moby/files/docker/run
diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
new file mode 100644
index 000000000000..6d8ef4e83729
--- /dev/null
+++ b/srcpkgs/moby/template
@@ -0,0 +1,51 @@
+# Template file for 'moby'
+pkgname=moby
+version=20.10.5
+revision=1
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd iptables xz"
+short_desc="Container engine for the Docker ecosystem"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+ https://github.com/docker/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+checksum="bcf651d75e5c80421e8cd3b0d47f3425e01047cf67aef0eda83b68776905a583
+ 9ce0fa64b00d9ef86971bdeb01cb24b02e6751c0d159ccb057521a41762750f4"
+system_groups="docker"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+
+do_build() {
+	export AUTO_GOPATH=1
+	export DOCKER_GITCOMMIT="tag v${version}"
+	export DOCKER_BUILDTAGS="seccomp"
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+	mkdir -p "$wrksrc/$_moby_builddir"
+	mkdir -p "$wrksrc/$_libnetwork_builddir"
+
+	msg_normal "Building docker-proxy (libnetwork)\n"
+	cd "$wrksrc/$_libnetwork_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
+	GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
+
+	msg_normal "Building docker-engine (moby)\n"
+	cd "$wrksrc/$_moby_builddir"
+	mkdir -p src/github.com/docker/
+	ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
+	GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+}
+
+do_install() {
+	vbin $_libnetwork_builddir/docker-proxy
+	vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
+	vsv docker
+}
diff --git a/srcpkgs/moby/update b/srcpkgs/moby/update
new file mode 100644
index 000000000000..3ff71c71f1f2
--- /dev/null
+++ b/srcpkgs/moby/update
@@ -0,0 +1 @@
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file