From: endigma <endigma@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] docker: refactor, update, segment
Date: Fri, 12 Mar 2021 05:34:25 +0100 [thread overview]
Message-ID: <20210312043425.kZ-xiwmuXz9wZgcl5eNMfl028yT2rr-g98W6gs3BpHE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29326@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]
There is an updated pull request by endigma 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: 38017 bytes --]
From c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:26 -0400
Subject: [PATCH 01/11] New package: docker-cli-20.10.5
---
srcpkgs/docker-cli/template | 48 +++++++++++++++++++++++++++++++++++++
srcpkgs/docker-cli/update | 1 +
2 files changed, 49 insertions(+)
create mode 100644 srcpkgs/docker-cli/template
create mode 100644 srcpkgs/docker-cli/update
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..99a42a47fb9
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,48 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
+
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+ export AUTO_GOPATH=1
+ export GITCOMMIT=$_cli_commit
+ export DISABLE_WARN_OUTSIDE_CONTAINER=1
+ unset CC
+
+ mkdir -p "$wrksrc/_cli_builddir"
+
+ cd "$wrksrc/$_cli_builddir"
+ mkdir -p src/github.com/docker/
+ ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+ GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+ vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
From 6789974036bc3df34d1aa32fe314b11f58d4b726 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:29 -0400
Subject: [PATCH 02/11] docker: update to 20.10.5.
---
srcpkgs/docker/files/docker/log/run | 1 -
srcpkgs/docker/files/docker/run | 8 --
srcpkgs/docker/template | 138 ++--------------------------
srcpkgs/docker/update | 1 -
4 files changed, 7 insertions(+), 141 deletions(-)
delete mode 120000 srcpkgs/docker/files/docker/log/run
delete mode 100755 srcpkgs/docker/files/docker/run
delete mode 100644 srcpkgs/docker/update
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run
deleted file mode 120000
index 3a5b4a58605..00000000000
--- a/srcpkgs/docker/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run
deleted file mode 100755
index ed42f5fa72f..00000000000
--- a/srcpkgs/docker/files/docker/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-modprobe -q loop || exit 1
-mountpoint -q /sys/fs/cgroup/systemd || {
- mkdir -p /sys/fs/cgroup/systemd;
- mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
-}
-exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..642bc1ecd71 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,14 @@
# Template file for 'docker'
pkgname=docker
-version=19.03.15
+version=20.10.5
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#*.*.}}"
+build_style=meta
-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"
+depends="docker-engine docker-cli"
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-# 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
-}
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'
From 8ea44c82c8cb7e34563f32909f734599f23f9728 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 14:29:33 -0400
Subject: [PATCH 03/11] New package: docker-engine-20.10.5
---
srcpkgs/docker-engine/files/docker/log/run | Bin 0 -> 116 bytes
srcpkgs/docker-engine/files/docker/run | 8 +++
srcpkgs/docker-engine/template | 67 +++++++++++++++++++++
srcpkgs/docker-engine/update | 1 +
4 files changed, 76 insertions(+)
create mode 100644 srcpkgs/docker-engine/files/docker/log/run
create mode 100644 srcpkgs/docker-engine/files/docker/run
create mode 100644 srcpkgs/docker-engine/template
create mode 100644 srcpkgs/docker-engine/update
diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 100644
index 0000000000000000000000000000000000000000..5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a
GIT binary patch
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20
literal 0
HcmV?d00001
diff --git a/srcpkgs/docker-engine/files/docker/run b/srcpkgs/docker-engine/files/docker/run
new file mode 100644
index 00000000000..ed42f5fa72f
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/run
@@ -0,0 +1,8 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+modprobe -q loop || exit 1
+mountpoint -q /sys/fs/cgroup/systemd || {
+ mkdir -p /sys/fs/cgroup/systemd;
+ mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd;
+}
+exec chpst -o 1048576 -p 1048576 dockerd $OPTS 2>&1
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..59d25887222
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,67 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+
+license="Apache-2.0"
+homepage="http://www.docker.io"
+
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc # https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+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"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+ export AUTO_GOPATH=1
+ export DOCKER_GITCOMMIT=$_moby_commit # for moby
+ export DOCKER_BUILDTAGS=$_buildtags #
+ export DISABLE_WARN_OUTSIDE_CONTAINER=1
+ unset CC
+
+ 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/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
From a92b6a60e46d97b10a469e23693a4a2ba70d090c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:07:59 -0400
Subject: [PATCH 04/11] Removed 'unset CC'
---
srcpkgs/docker-cli/template | 1 -
srcpkgs/docker-engine/template | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 99a42a47fb9..b66e6a4c966 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -33,7 +33,6 @@ do_build() {
export AUTO_GOPATH=1
export GITCOMMIT=$_cli_commit
export DISABLE_WARN_OUTSIDE_CONTAINER=1
- unset CC
mkdir -p "$wrksrc/_cli_builddir"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 59d25887222..b4d1d4c4274 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,8 +42,7 @@ do_build() {
export DOCKER_GITCOMMIT=$_moby_commit # for moby
export DOCKER_BUILDTAGS=$_buildtags #
export DISABLE_WARN_OUTSIDE_CONTAINER=1
- unset CC
-
+
mkdir -p "$wrksrc/$_moby_builddir"
mkdir -p "$wrksrc/$_libnetwork_builddir"
From a8230058a15f75c17efbaa76aa8bdcb4d695a64f Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:10:30 -0400
Subject: [PATCH 05/11] "Trailing Whitespace"
---
srcpkgs/docker-engine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index b4d1d4c4274..4698027dbdc 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -42,7 +42,7 @@ do_build() {
export DOCKER_GITCOMMIT=$_moby_commit # for moby
export DOCKER_BUILDTAGS=$_buildtags #
export DISABLE_WARN_OUTSIDE_CONTAINER=1
-
+
mkdir -p "$wrksrc/$_moby_builddir"
mkdir -p "$wrksrc/$_libnetwork_builddir"
From 71ce229d080bdca3202aa20a5a8e3a9c107680a2 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Mon, 8 Mar 2021 15:12:04 -0400
Subject: [PATCH 06/11] Remove unneeded newlines
---
srcpkgs/docker-cli/template | 6 ------
srcpkgs/docker-engine/template | 6 ------
srcpkgs/docker/template | 4 ----
3 files changed, 16 deletions(-)
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index b66e6a4c966..444c51925bd 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,22 +2,16 @@
pkgname=docker-cli
version=20.10.5
revision=1
-
archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
create_wrksrc=yes
build_style=go
go_import_path="github.com/docker/cli"
-
hostmakedepends="pkg-config tar"
depends="containerd runc iptables xz git"
-
short_desc="Pack, ship and run any application as a lightweight container - cli"
maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
license="Apache-2.0"
homepage="http://www.docker.io"
-
system_groups="docker"
distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 4698027dbdc..0a72a884f5e 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,23 +2,17 @@
pkgname=docker-engine
version=20.10.5
revision=1
-
archs="aarch64* armv[67]l* x86_64* ppc64le*"
-
create_wrksrc=yes
build_style=go
go_import_path="github.com/docker/docker"
-
hostmakedepends="pkg-config tar"
makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
depends="containerd runc iptables xz git"
-
short_desc="Pack, ship and run any application as a lightweight container - engine"
maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
license="Apache-2.0"
homepage="http://www.docker.io"
-
system_groups="docker"
_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc # https://github.com/moby/moby/commits/v$version
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index 642bc1ecd71..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -2,13 +2,9 @@
pkgname=docker
version=20.10.5
revision=1
-
build_style=meta
-
depends="docker-engine docker-cli"
-
short_desc="Docker meta-package including the engine and cli tool"
maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
-
license="Apache-2.0"
homepage="http://docker.io/"
From 7c3684158842a769e5290df12ea1a7d386bbf44a Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:03:00 -0400
Subject: [PATCH 07/11] Update srcpkgs/docker-cli/template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
srcpkgs/docker-cli/template | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 444c51925bd..555585e3f13 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,11 +12,9 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
license="Apache-2.0"
homepage="http://www.docker.io"
-system_groups="docker"
-
distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz>cli-$version.tar.gz"
-
checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
_cli_builddir="cli-$version"
From 309b66627b2fc68d0e3e30cf0c520921a448dc57 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:07:20 -0400
Subject: [PATCH 08/11] Fixed the symlink in /log/
---
srcpkgs/docker-engine/files/docker/log/run | Bin 116 -> 16 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 120000 srcpkgs/docker-engine/files/docker/log/run
diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
deleted file mode 100644
index 5c41e85f3a3518c3b3d24513d7e0d0a00d78c93a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 116
zcmeZ`c)x!y12Y2y0}BuX*&r^62J%3_0ZfucKy>rT18F{xQJg@m2*iv&AVx?A05{Vb
AssI20
diff --git a/srcpkgs/docker-engine/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
new file mode 120000
index 00000000000..3a5b4a58605
--- /dev/null
+++ b/srcpkgs/docker-engine/files/docker/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
From d89dd1d8f43adcbc70c7bd2a7e4b9cc632d6032c Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 20:13:14 -0400
Subject: [PATCH 09/11] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
commit 309b66627b2fc68d0e3e30cf0c520921a448dc57
Author: endigma <endigma4426@gmail.com>
Date: Thu Mar 11 20:07:20 2021 -0400
Fixed the symlink in /log/
commit 7c3684158842a769e5290df12ea1a7d386bbf44a
Author: endigma <endigma4426@gmail.com>
Date: Thu Mar 11 20:03:00 2021 -0400
Update srcpkgs/docker-cli/template
Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
commit 71ce229d080bdca3202aa20a5a8e3a9c107680a2
Author: endigma <endigma4426@gmail.com>
Date: Mon Mar 8 15:12:04 2021 -0400
Remove unneeded newlines
commit a8230058a15f75c17efbaa76aa8bdcb4d695a64f
Author: endigma <endigma4426@gmail.com>
Date: Mon Mar 8 15:10:30 2021 -0400
"Trailing Whitespace"
commit a92b6a60e46d97b10a469e23693a4a2ba70d090c
Author: endigma <endigma4426@gmail.com>
Date: Mon Mar 8 15:07:59 2021 -0400
Removed 'unset CC'
commit 8ea44c82c8cb7e34563f32909f734599f23f9728
Author: endigma <endigma4426@gmail.com>
Date: Mon Mar 8 14:29:33 2021 -0400
New package: docker-engine-20.10.5
commit 6789974036bc3df34d1aa32fe314b11f58d4b726
Author: endigma <endigma4426@gmail.com>
Date: Mon Mar 8 14:29:29 2021 -0400
docker: update to 20.10.5.
commit c8b91f504ba7d7bb5b8eaaaaf3bcca9cc9d762b4
Author: endigma <endigma4426@gmail.com>
Date: Mon Mar 8 14:29:26 2021 -0400
New package: docker-cli-20.10.5
---
srcpkgs/docker-cli/template | 39 +++++
srcpkgs/docker-cli/update | 1 +
.../files/docker/log/run | 0
.../files/docker/run | 0
srcpkgs/docker-engine/template | 60 ++++++++
srcpkgs/docker-engine/update | 1 +
srcpkgs/docker/template | 142 +-----------------
srcpkgs/docker/update | 1 -
8 files changed, 108 insertions(+), 136 deletions(-)
create mode 100644 srcpkgs/docker-cli/template
create mode 100644 srcpkgs/docker-cli/update
rename srcpkgs/{docker => docker-engine}/files/docker/log/run (100%)
rename srcpkgs/{docker => docker-engine}/files/docker/run (100%)
mode change 100755 => 100644
create mode 100644 srcpkgs/docker-engine/template
create mode 100644 srcpkgs/docker-engine/update
delete mode 100644 srcpkgs/docker/update
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
new file mode 100644
index 00000000000..555585e3f13
--- /dev/null
+++ b/srcpkgs/docker-cli/template
@@ -0,0 +1,39 @@
+# Template file for 'docker-cli'
+pkgname=docker-cli
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/cli"
+hostmakedepends="pkg-config tar"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - cli"
+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>cli-$version.tar.gz"
+checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
+system_groups="docker"
+
+_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
+_cli_builddir="cli-$version"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+ export AUTO_GOPATH=1
+ export GITCOMMIT=$_cli_commit
+ export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+ mkdir -p "$wrksrc/_cli_builddir"
+
+ cd "$wrksrc/$_cli_builddir"
+ mkdir -p src/github.com/docker/
+ ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+ GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
+}
+
+do_install() {
+ vbin $_cli_builddir/build/docker
+}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
new file mode 100644
index 00000000000..47936e12584
--- /dev/null
+++ b/srcpkgs/docker-cli/update
@@ -0,0 +1 @@
+pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker-engine/files/docker/log/run
similarity index 100%
rename from srcpkgs/docker/files/docker/log/run
rename to srcpkgs/docker-engine/files/docker/log/run
diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker-engine/files/docker/run
old mode 100755
new mode 100644
similarity index 100%
rename from srcpkgs/docker/files/docker/run
rename to srcpkgs/docker-engine/files/docker/run
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
new file mode 100644
index 00000000000..0a72a884f5e
--- /dev/null
+++ b/srcpkgs/docker-engine/template
@@ -0,0 +1,60 @@
+# Template file for 'docker-engine'
+pkgname=docker-engine
+version=20.10.5
+revision=1
+archs="aarch64* armv[67]l* x86_64* ppc64le*"
+create_wrksrc=yes
+build_style=go
+go_import_path="github.com/docker/docker"
+hostmakedepends="pkg-config tar"
+makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
+depends="containerd runc iptables xz git"
+short_desc="Pack, ship and run any application as a lightweight container - engine"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://www.docker.io"
+system_groups="docker"
+
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc # https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+
+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"
+
+_moby_builddir="moby-$version"
+_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+_buildtags="seccomp"
+
+export GO111MODULE=off # go1.16 defaults to on
+
+do_build() {
+ export AUTO_GOPATH=1
+ export DOCKER_GITCOMMIT=$_moby_commit # for moby
+ export DOCKER_BUILDTAGS=$_buildtags #
+ 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/docker-engine/update b/srcpkgs/docker-engine/update
new file mode 100644
index 00000000000..6e08485891e
--- /dev/null
+++ b/srcpkgs/docker-engine/update
@@ -0,0 +1 @@
+pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template
index e0830515a33..67aa113493f 100644
--- a/srcpkgs/docker/template
+++ b/srcpkgs/docker/template
@@ -1,138 +1,10 @@
# Template file for 'docker'
pkgname=docker
-version=19.03.15
+version=20.10.5
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
-}
+build_style=meta
+depends="docker-engine docker-cli"
+short_desc="Docker meta-package including the engine and cli tool"
+maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+license="Apache-2.0"
+homepage="http://docker.io/"
diff --git a/srcpkgs/docker/update b/srcpkgs/docker/update
deleted file mode 100644
index 164bab51736..00000000000
--- a/srcpkgs/docker/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='href="/docker/docker-ce/releases/tag/v\K[\d\.]+(?=")'
From 5f5973ed0090b362ca42f40c2007afd35f384291 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Thu, 11 Mar 2021 21:03:36 -0400
Subject: [PATCH 10/11] Un-named distfiles in single-distfile template
---
srcpkgs/docker-cli/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 555585e3f13..3967e2019b9 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -12,7 +12,7 @@ short_desc="Pack, ship and run any application as a lightweight container - cli"
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>cli-$version.tar.gz"
+distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
system_groups="docker"
From ee7ea574f21df2012e43bd0d3411c4bec7daa6c9 Mon Sep 17 00:00:00 2001
From: endigma <endigma4426@gmail.com>
Date: Fri, 12 Mar 2021 00:34:17 -0400
Subject: [PATCH 11/11] Implemented suggestions from ahesford, along with a few
changes.
---
srcpkgs/docker-cli/template | 19 ++++++-------------
srcpkgs/docker-cli/update | 2 +-
srcpkgs/docker-engine/template | 20 +++++++-------------
srcpkgs/docker-engine/update | 2 +-
4 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 3967e2019b9..df84999e59b 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -2,13 +2,12 @@
pkgname=docker-cli
version=20.10.5
revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
-create_wrksrc=yes
build_style=go
+wrksrc="cli-${version}"
go_import_path="github.com/docker/cli"
hostmakedepends="pkg-config tar"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - cli"
+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"
@@ -16,24 +15,18 @@ distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
checksum=4ba845f8c7e2e0a2ca1ec6589847159ca8d0d37b609f0e6f78def7a893b9b342
system_groups="docker"
-_cli_commit=55c4c88966a912ddb365e2d73a4969e700fc458f
-_cli_builddir="cli-$version"
-
export GO111MODULE=off # go1.16 defaults to on
do_build() {
export AUTO_GOPATH=1
- export GITCOMMIT=$_cli_commit
+ export GITCOMMIT=55c4c88966a912ddb365e2d73a4969e700fc458f
export DISABLE_WARN_OUTSIDE_CONTAINER=1
- mkdir -p "$wrksrc/_cli_builddir"
-
- cd "$wrksrc/$_cli_builddir"
mkdir -p src/github.com/docker/
- ln -sf "$wrksrc/$_cli_builddir" src/github.com/docker/cli
+ ln -sf "$wrksrc" src/github.com/docker/cli
GOPATH="$PWD" LDFLAGS="" VERSION="$version" make dynbinary
}
do_install() {
- vbin $_cli_builddir/build/docker
+ vbin build/docker
}
diff --git a/srcpkgs/docker-cli/update b/srcpkgs/docker-cli/update
index 47936e12584..2402ccb6eb5 100644
--- a/srcpkgs/docker-cli/update
+++ b/srcpkgs/docker-cli/update
@@ -1 +1 @@
-pattern='href="/docker/cli/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
diff --git a/srcpkgs/docker-engine/template b/srcpkgs/docker-engine/template
index 0a72a884f5e..1c058305b03 100644
--- a/srcpkgs/docker-engine/template
+++ b/srcpkgs/docker-engine/template
@@ -2,39 +2,33 @@
pkgname=docker-engine
version=20.10.5
revision=1
-archs="aarch64* armv[67]l* x86_64* ppc64le*"
+_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4d # https://github.com/moby/moby/commits/v$version
+_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
create_wrksrc=yes
build_style=go
go_import_path="github.com/docker/docker"
hostmakedepends="pkg-config tar"
makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
-depends="containerd runc iptables xz git"
-short_desc="Pack, ship and run any application as a lightweight container - engine"
+depends="containerd iptables xz"
+short_desc="Engine for the Docker container daemon"
maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
license="Apache-2.0"
homepage="http://www.docker.io"
-system_groups="docker"
-
-_moby_commit=363e9a88a11be517d9e8c65c998ff56f774eb4dc # https://github.com/moby/moby/commits/v$version
-_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
-
-distfiles="
- https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
+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"
-_buildtags="seccomp"
export GO111MODULE=off # go1.16 defaults to on
do_build() {
export AUTO_GOPATH=1
export DOCKER_GITCOMMIT=$_moby_commit # for moby
- export DOCKER_BUILDTAGS=$_buildtags #
+ export DOCKER_BUILDTAGS="seccomp" #
export DISABLE_WARN_OUTSIDE_CONTAINER=1
mkdir -p "$wrksrc/$_moby_builddir"
diff --git a/srcpkgs/docker-engine/update b/srcpkgs/docker-engine/update
index 6e08485891e..3ff71c71f1f 100644
--- a/srcpkgs/docker-engine/update
+++ b/srcpkgs/docker-engine/update
@@ -1 +1 @@
-pattern='href="/docker/engine/releases/tag/v\K[\d\.]+(?=")'
+pattern="v\K[\d\.]+(?=\.tar\.gz)"
\ No newline at end of file
next prev parent reply other threads:[~2021-03-12 4:34 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-08 18:30 [PR PATCH] " endigma
2021-03-08 18:56 ` endigma
2021-03-08 19:08 ` [PR PATCH] [Updated] " endigma
2021-03-08 19:10 ` endigma
2021-03-08 19:10 ` endigma
2021-03-08 19:12 ` [PR PATCH] [Updated] " endigma
2021-03-08 19:36 ` endigma
2021-03-08 19:37 ` endigma
2021-03-08 19:38 ` endigma
2021-03-11 21:04 ` [PR REVIEW] " ericonr
2021-03-11 21:04 ` ericonr
2021-03-11 21:04 ` ericonr
2021-03-11 21:04 ` ericonr
2021-03-11 21:04 ` ericonr
2021-03-11 23:56 ` [PR REVIEW] " endigma
2021-03-12 0:00 ` endigma
2021-03-12 0:00 ` endigma
2021-03-12 0:01 ` endigma
2021-03-12 0:02 ` [PR REVIEW] " endigma
2021-03-12 0:02 ` endigma
2021-03-12 0:03 ` [PR PATCH] [Updated] " endigma
2021-03-12 0:05 ` endigma
2021-03-12 0:07 ` [PR PATCH] [Updated] " endigma
2021-03-12 0:13 ` endigma
2021-03-12 0:15 ` endigma
2021-03-12 0:25 ` [PR REVIEW] " sgn
2021-03-12 1:03 ` [PR PATCH] [Updated] " endigma
2021-03-12 2:00 ` [PR REVIEW] " ahesford
2021-03-12 2:00 ` ahesford
2021-03-12 2:00 ` ahesford
2021-03-12 2:00 ` ahesford
2021-03-12 2:00 ` ahesford
2021-03-12 2:00 ` ahesford
2021-03-12 2:00 ` ahesford
2021-03-12 2:00 ` ahesford
2021-03-12 2:00 ` ahesford
2021-03-12 2:00 ` ahesford
2021-03-12 2:00 ` ahesford
2021-03-12 2:19 ` ericonr
2021-03-12 3:35 ` endigma
2021-03-12 3:39 ` endigma
2021-03-12 3:39 ` endigma
2021-03-12 3:41 ` endigma
2021-03-12 3:42 ` endigma
2021-03-12 3:47 ` endigma
2021-03-12 3:47 ` endigma
2021-03-12 3:49 ` endigma
2021-03-12 3:50 ` endigma
2021-03-12 3:57 ` endigma
2021-03-12 4:00 ` endigma
2021-03-12 4:01 ` endigma
2021-03-12 4:02 ` endigma
2021-03-12 4:02 ` endigma
2021-03-12 4:14 ` endigma
2021-03-12 4:14 ` endigma
2021-03-12 4:21 ` endigma
2021-03-12 4:22 ` endigma
2021-03-12 4:22 ` endigma
2021-03-12 4:23 ` endigma
2021-03-12 4:24 ` endigma
2021-03-12 4:24 ` endigma
2021-03-12 4:30 ` ahesford
2021-03-12 4:30 ` ahesford
2021-03-12 4:30 ` ahesford
2021-03-12 4:30 ` ahesford
2021-03-12 4:30 ` endigma
2021-03-12 4:34 ` endigma [this message]
2021-03-12 4:36 ` [PR PATCH] [Updated] " endigma
2021-03-12 4:37 ` [PR REVIEW] " endigma
2021-03-12 4:43 ` [PR PATCH] [Updated] " endigma
2021-03-12 4:43 ` [PR REVIEW] " endigma
2021-03-12 4:48 ` endigma
2021-03-12 4:48 ` endigma
2021-03-12 4:51 ` [PR PATCH] [Updated] " endigma
2021-03-16 15:51 ` endigma
2021-03-16 15:55 ` endigma
2021-03-16 17:24 ` [PR PATCH] [Updated] " rainyuu
2021-03-16 17:26 ` [PR REVIEW] " endigma
2021-03-16 17:26 ` endigma
2021-03-16 17:40 ` [PR PATCH] [Updated] " rainyuu
2021-03-16 18:41 ` rainyuu
2021-03-20 14:42 ` endigma
2021-03-20 15:25 ` dm17
2021-03-20 15:40 ` ahesford
2021-03-20 16:04 ` endigma
2021-03-21 5:40 ` [PR REVIEW] " sgn
2021-03-24 13:10 ` [PR PATCH] [Updated] " radiden
2021-03-24 13:19 ` radiden
2021-03-24 13:26 ` radiden
2021-03-24 13:26 ` radiden
2021-03-25 15:17 ` endigma
2021-03-31 2:38 ` endigma
2021-03-31 18:42 ` [PR PATCH] [Updated] " endigma
2021-03-31 18:42 ` endigma
2021-03-31 18:43 ` endigma
2021-04-01 18:50 ` ahesford
2021-04-01 18:50 ` [PR PATCH] [Closed]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210312043425.kZ-xiwmuXz9wZgcl5eNMfl028yT2rr-g98W6gs3BpHE@z \
--to=endigma@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).