[arch-commits] Commit in docker/trunk (PKGBUILD)

2022-09-10 Thread Morten Linderud via arch-commits 
Date: Saturday, September 10, 2022 @ 11:44:07
  Author: foxboron
Revision: 1298813

upgpkg: docker 1:20.10.18-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |   27 +--
 1 file changed, 5 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-09-10 11:28:21 UTC (rev 1298812)
+++ PKGBUILD2022-09-10 11:44:07 UTC (rev 1298813)
@@ -2,11 +2,11 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.17
+pkgver=20.10.18
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
-arch=('x86_64')
+arch=('x86_64' 'aarch64')
 url='https://www.docker.com/'
 license=('Apache')
 depends=('glibc' 'bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 
'systemd-libs'
@@ -14,23 +14,20 @@
 makedepends=('git' 'go' 'btrfs-progs' 'cmake' 'systemd' 'go-md2man' 'sed')
 optdepends=('btrfs-progs: btrfs backend support'
 'pigz: parallel gzip compressor support'
-'docker-scan: vulnerability scanner')
+'docker-scan: vulnerability scanner',
+'docker-buildx: extended build capabilities')
 # https://github.com/moby/moby/tree/v20.10.0/hack/dockerfile/install
 _TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
-_LIBNETWORK_COMMIT=f6b1c082a432c2a5814aaedaca56af33d9ea
-# TODO: Split into `docker-buildx` and make it a dependency
-_BUILDX_COMMIT=6224def4dd2c3d347eee19db595348c50d7cb491
+_LIBNETWORK_COMMIT=0dde5c895075df6e3630e76f750a447cf63f4789
 source=("git+https://github.com/docker/cli.git#tag=v$pkgver;
 "git+https://github.com/moby/moby.git#tag=v$pkgver;
 
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
 "git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT;
-"git+https://github.com/docker/buildx.git#commit=$_BUILDX_COMMIT;
 "$pkgname.sysusers")
 sha256sums=('SKIP'
 'SKIP'
 'SKIP'
 'SKIP'
-'SKIP'
 '541826011a9836d05a2f42293d5f1beadf2ca8d89fb604487d61a013505678eb')
 
 # create a fake go path directory and pushd into it
@@ -110,17 +107,6 @@
   # we must use the static binary because it's started in a foreign os
   make tini-static
   _fake_gopath_popd
-
-  ### buildx cli plugin
-  echo 'Building buildx cli plugin'
-  _buildx_r=github.com/docker/buildx
-  _fake_gopath_pushd buildx $_buildx_r
-  GO111MODULE=on go build -mod=vendor -o docker-buildx -ldflags 
"-linkmode=external \
--X $_buildx_r/version.Version=$(git describe --match 'v[0-9]*' --always 
--tags)-docker \
--X $_buildx_r/version.Revision=$(git rev-parse HEAD) \
--X $_buildx_r/version.Package=$_buildx_r" \
-./cmd/buildx
-  _fake_gopath_popd
 }
 
 package() {
@@ -148,9 +134,6 @@
   # man
   install -dm755 "$pkgdir/usr/share/man"
   cp -r man/man* "$pkgdir/usr/share/man"
-  # cli-plugins
-  cd "$srcdir"/src/github.com/docker
-  install -Dm755 buildx/docker-buildx 
"$pkgdir/usr/lib/docker/cli-plugins/docker-buildx"
 }
 
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in docker/trunk (PKGBUILD)

2022-06-11 Thread Sébastien Luttringer via arch-commits 
Date: Saturday, June 11, 2022 @ 23:36:17
  Author: seblu
Revision: 1235691

upgpkg: docker 1:20.10.17-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-06-11 23:36:14 UTC (rev 1235690)
+++ PKGBUILD2022-06-11 23:36:17 UTC (rev 1235691)
@@ -2,7 +2,7 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.16
+pkgver=20.10.17
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -17,7 +17,7 @@
 'docker-scan: vulnerability scanner')
 # https://github.com/moby/moby/tree/v20.10.0/hack/dockerfile/install
 _TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
-_LIBNETWORK_COMMIT=339b972b464ee3d401b5788b2af9e31d09d6b7da
+_LIBNETWORK_COMMIT=f6b1c082a432c2a5814aaedaca56af33d9ea
 # TODO: Split into `docker-buildx` and make it a dependency
 _BUILDX_COMMIT=6224def4dd2c3d347eee19db595348c50d7cb491
 source=("git+https://github.com/docker/cli.git#tag=v$pkgver;

[arch-commits] Commit in docker/trunk (PKGBUILD)

2022-05-14 Thread Morten Linderud via arch-commits 
Date: Saturday, May 14, 2022 @ 13:01:23
  Author: foxboron
Revision: 1204373

upgpkg: docker 1:20.10.16-1: upgpkg: docker 1:20.10.16-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-14 13:01:21 UTC (rev 1204372)
+++ PKGBUILD2022-05-14 13:01:23 UTC (rev 1204373)
@@ -2,7 +2,7 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.15
+pkgver=20.10.16
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -19,7 +19,7 @@
 _TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
 _LIBNETWORK_COMMIT=339b972b464ee3d401b5788b2af9e31d09d6b7da
 # TODO: Split into `docker-buildx` and make it a dependency
-_BUILDX_COMMIT=5fac64c2c49dae1320f2b51f1a899ca451935554
+_BUILDX_COMMIT=6224def4dd2c3d347eee19db595348c50d7cb491
 source=("git+https://github.com/docker/cli.git#tag=v$pkgver;
 "git+https://github.com/moby/moby.git#tag=v$pkgver;
 
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;

[arch-commits] Commit in docker/trunk (PKGBUILD)

2022-05-05 Thread Sébastien Luttringer via arch-commits 
Date: Thursday, May 5, 2022 @ 23:26:06
  Author: seblu
Revision: 1195582

upgpkg: docker 1:20.10.15-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-05 23:22:41 UTC (rev 1195581)
+++ PKGBUILD2022-05-05 23:26:06 UTC (rev 1195582)
@@ -2,7 +2,7 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.14
+pkgver=20.10.15
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -17,7 +17,7 @@
 'docker-scan: vulnerability scanner')
 # https://github.com/moby/moby/tree/v20.10.0/hack/dockerfile/install
 _TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
-_LIBNETWORK_COMMIT=64b7a4574d1426139437d20e81c0b6d391130ec8
+_LIBNETWORK_COMMIT=339b972b464ee3d401b5788b2af9e31d09d6b7da
 # TODO: Split into `docker-buildx` and make it a dependency
 _BUILDX_COMMIT=5fac64c2c49dae1320f2b51f1a899ca451935554
 source=("git+https://github.com/docker/cli.git#tag=v$pkgver;

[arch-commits] Commit in docker/trunk (PKGBUILD)

2022-03-24 Thread Sébastien Luttringer via arch-commits 
Date: Thursday, March 24, 2022 @ 09:03:03
  Author: seblu
Revision: 1173894

upgpkg: docker 1:20.10.14-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-03-24 08:49:21 UTC (rev 1173893)
+++ PKGBUILD2022-03-24 09:03:03 UTC (rev 1173894)
@@ -2,7 +2,7 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.13
+pkgver=20.10.14
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -19,7 +19,7 @@
 _TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
 _LIBNETWORK_COMMIT=64b7a4574d1426139437d20e81c0b6d391130ec8
 # TODO: Split into `docker-buildx` and make it a dependency
-_BUILDX_COMMIT=c8f7c1e93ffa9cfcf926cd3e6450af957f235b07
+_BUILDX_COMMIT=5fac64c2c49dae1320f2b51f1a899ca451935554
 source=("git+https://github.com/docker/cli.git#tag=v$pkgver;
 "git+https://github.com/moby/moby.git#tag=v$pkgver;
 
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
@@ -57,14 +57,14 @@
   done
   local _commit _pkgbuild _dockerfile
   err=0
-  for _commit in LIBNETWORK TINI; do
+  # FIXME: Do not check TINI anymore, use tag instead of commit
+  for _commit in LIBNETWORK; do
 _pkgbuild=_${_commit}_COMMIT
 _dockerfile=${_commit}_COMMIT
-# TODO: We need to patch upstream to not use tags
-#if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then
-#  echo "Invalid $_commit commit, should be ${!_dockerfile}" >&2
-#  err=$(($err + 1))
-#fi
+if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then
+  echo "Invalid $_commit commit, should be ${!_dockerfile}" >&2
+  err=$(($err + 1))
+fi
   done
   return $err
   )

[arch-commits] Commit in docker/trunk (PKGBUILD)

2022-03-12 Thread Morten Linderud via arch-commits 
Date: Saturday, March 12, 2022 @ 14:16:56
  Author: foxboron
Revision: 1149946

upgpkg: docker 1:20.10.13-1: upgpkg: docker 1:20.10.13-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-03-12 14:03:37 UTC (rev 1149945)
+++ PKGBUILD2022-03-12 14:16:56 UTC (rev 1149946)
@@ -2,7 +2,7 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.12
+pkgver=20.10.13
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -19,7 +19,7 @@
 _TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
 _LIBNETWORK_COMMIT=64b7a4574d1426139437d20e81c0b6d391130ec8
 # TODO: Split into `docker-buildx` and make it a dependency
-_BUILDX_COMMIT=05846896d149da05f3d6fd1e7770da187b52a247
+_BUILDX_COMMIT=c8f7c1e93ffa9cfcf926cd3e6450af957f235b07
 source=("git+https://github.com/docker/cli.git#tag=v$pkgver;
 "git+https://github.com/moby/moby.git#tag=v$pkgver;
 
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
@@ -60,10 +60,11 @@
   for _commit in LIBNETWORK TINI; do
 _pkgbuild=_${_commit}_COMMIT
 _dockerfile=${_commit}_COMMIT
-if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then
-  echo "Invalid $_commit commit, should be ${!_dockerfile}" >&2
-  err=$(($err + 1))
-fi
+# TODO: We need to patch upstream to not use tags
+#if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then
+#  echo "Invalid $_commit commit, should be ${!_dockerfile}" >&2
+#  err=$(($err + 1))
+#fi
   done
   return $err
   )

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-12-13 Thread Morten Linderud via arch-commits 
Date: Monday, December 13, 2021 @ 22:35:50
  Author: foxboron
Revision: 1072565

upgpkg: docker 1:20.10.12-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-12-13 22:28:03 UTC (rev 1072564)
+++ PKGBUILD2021-12-13 22:35:50 UTC (rev 1072565)
@@ -2,7 +2,7 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.11
+pkgver=20.10.12
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -13,12 +13,13 @@
  'libseccomp' 'libtool' 'runc' 'containerd')
 makedepends=('git' 'go' 'btrfs-progs' 'cmake' 'systemd' 'go-md2man' 'sed')
 optdepends=('btrfs-progs: btrfs backend support'
-'pigz: parallel gzip compressor support')
+'pigz: parallel gzip compressor support'
+'docker-scan: vulnerability scanner')
 # https://github.com/moby/moby/tree/v20.10.0/hack/dockerfile/install
 _TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
 _LIBNETWORK_COMMIT=64b7a4574d1426139437d20e81c0b6d391130ec8
-# https://github.com/docker/docker-ce-packaging/pull/562
-_BUILDX_COMMIT=260d07a9a19b03df969787496419a0808a27ac61
+# TODO: Split into `docker-buildx` and make it a dependency
+_BUILDX_COMMIT=05846896d149da05f3d6fd1e7770da187b52a247
 source=("git+https://github.com/docker/cli.git#tag=v$pkgver;
 "git+https://github.com/moby/moby.git#tag=v$pkgver;
 
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-11-20 Thread Morten Linderud via arch-commits 
Date: Saturday, November 20, 2021 @ 13:02:13
  Author: foxboron
Revision: 1052872

upgpkg: docker 1:20.10.11-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-11-20 12:59:27 UTC (rev 1052871)
+++ PKGBUILD2021-11-20 13:02:13 UTC (rev 1052872)
@@ -2,7 +2,7 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.10
+pkgver=20.10.11
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-10-25 Thread Sébastien Luttringer via arch-commits 
Date: Tuesday, October 26, 2021 @ 03:47:39
  Author: seblu
Revision: 1033704

upgpkg: docker 1:20.10.10-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-10-26 01:29:58 UTC (rev 1033703)
+++ PKGBUILD2021-10-26 03:47:39 UTC (rev 1033704)
@@ -2,7 +2,7 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.9
+pkgver=20.10.10
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-10-04 Thread Morten Linderud via arch-commits 
Date: Monday, October 4, 2021 @ 19:21:40
  Author: foxboron
Revision: 1027653

upgpkg: docker 1:20.10.9-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-10-04 19:19:31 UTC (rev 1027652)
+++ PKGBUILD2021-10-04 19:21:40 UTC (rev 1027653)
@@ -2,7 +2,7 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.8
+pkgver=20.10.9
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-08-04 Thread Sébastien Luttringer via arch-commits 
Date: Wednesday, August 4, 2021 @ 11:02:05
  Author: seblu
Revision: 993629

upgpkg: docker 1:20.10.8-1

- Bump to docker moby 20.10.8
- Drop deprecated and archived app plugin 
(https://github.com/docker/docker-ce-packaging/pull/548)
- Upgrade buildx to 0.6.1 
(https://github.com/docker/docker-ce-packaging/pull/562)

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |   32 
 1 file changed, 12 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-08-04 10:57:18 UTC (rev 993628)
+++ PKGBUILD2021-08-04 11:02:05 UTC (rev 993629)
@@ -2,7 +2,7 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.7
+pkgver=20.10.8
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -17,14 +17,13 @@
 # https://github.com/moby/moby/tree/v20.10.0/hack/dockerfile/install
 _TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
 _LIBNETWORK_COMMIT=64b7a4574d1426139437d20e81c0b6d391130ec8
-_BUILDX_COMMIT=11057da37336192bfc57d81e02359ba7ba848e4a
-_APP_COMMIT=9d2c67f87b7338eb1a0fa2f18eb81af3d2aac0e1
+# https://github.com/docker/docker-ce-packaging/pull/562
+_BUILDX_COMMIT=260d07a9a19b03df969787496419a0808a27ac61
 source=("git+https://github.com/docker/cli.git#tag=v$pkgver;
 "git+https://github.com/moby/moby.git#tag=v$pkgver;
 
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
 "git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT;
 "git+https://github.com/docker/buildx.git#commit=$_BUILDX_COMMIT;
-"git+https://github.com/docker/app.git#commit=$_APP_COMMIT;
 "$pkgname.sysusers")
 sha256sums=('SKIP'
 'SKIP'
@@ -31,7 +30,6 @@
 'SKIP'
 'SKIP'
 'SKIP'
-'SKIP'
 '541826011a9836d05a2f42293d5f1beadf2ca8d89fb604487d61a013505678eb')
 
 # create a fake go path directory and pushd into it
@@ -79,11 +77,12 @@
   export LDFLAGS=''
   export GOFLAGS='-buildmode=pie -trimpath -mod=readonly -modcacherw 
-ldflags=-linkmode=external'
   export GO111MODULE=off
+  export DISABLE_WARN_OUTSIDE_CONTAINER=1
 
   ### cli
   echo 'Building cli'
   _fake_gopath_pushd cli github.com/docker/cli
-  DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=$pkgver dynbinary
+  make VERSION=$pkgver dynbinary
   make manpages
   _fake_gopath_popd
 
@@ -110,22 +109,16 @@
   make tini-static
   _fake_gopath_popd
 
-  ### app cli plugin
-  echo 'Building app cli plugin'
-  _fake_gopath_pushd app github.com/docker/app
-  make dynamic
-  _fake_gopath_popd
-
   ### buildx cli plugin
   echo 'Building buildx cli plugin'
-  _fake_gopath_pushd buildx github.com/docker/buildx
-  go build -o docker-buildx -ldflags "\
--X github.com/docker/buildx/version.Version=$(git describe --match 
'v[0-9]*' --always --tags)-tp-docker \
--X github.com/docker/buildx/version.Revision=$(git rev-parse HEAD) \
--X github.com/docker/buildx/version.Package=github.com/docker/buildx \
--X main.experimental=1 -linkmode=external" ./cmd/buildx
+  _buildx_r=github.com/docker/buildx
+  _fake_gopath_pushd buildx $_buildx_r
+  GO111MODULE=on go build -mod=vendor -o docker-buildx -ldflags 
"-linkmode=external \
+-X $_buildx_r/version.Version=$(git describe --match 'v[0-9]*' --always 
--tags)-docker \
+-X $_buildx_r/version.Revision=$(git rev-parse HEAD) \
+-X $_buildx_r/version.Package=$_buildx_r" \
+./cmd/buildx
   _fake_gopath_popd
-
 }
 
 package() {
@@ -155,7 +148,6 @@
   cp -r man/man* "$pkgdir/usr/share/man"
   # cli-plugins
   cd "$srcdir"/src/github.com/docker
-  install -Dm755 app/bin/docker-app 
"$pkgdir/usr/lib/docker/cli-plugins/docker-app"
   install -Dm755 buildx/docker-buildx 
"$pkgdir/usr/lib/docker/cli-plugins/docker-buildx"
 }

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-06-04 Thread Sébastien Luttringer via arch-commits 
Date: Friday, June 4, 2021 @ 09:18:53
  Author: seblu
Revision: 955909

upgpkg: docker 1:20.10.7-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-06-04 09:04:53 UTC (rev 955908)
+++ PKGBUILD2021-06-04 09:18:53 UTC (rev 955909)
@@ -2,7 +2,7 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.6
+pkgver=20.10.7
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -16,7 +16,7 @@
 'pigz: parallel gzip compressor support')
 # https://github.com/moby/moby/tree/v20.10.0/hack/dockerfile/install
 _TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
-_LIBNETWORK_COMMIT=b3507428be5b458cb0e2b4086b13531fb0706e46
+_LIBNETWORK_COMMIT=64b7a4574d1426139437d20e81c0b6d391130ec8
 _BUILDX_COMMIT=11057da37336192bfc57d81e02359ba7ba848e4a
 _APP_COMMIT=9d2c67f87b7338eb1a0fa2f18eb81af3d2aac0e1
 source=("git+https://github.com/docker/cli.git#tag=v$pkgver;

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-04-12 Thread Sébastien Luttringer via arch-commits 
Date: Monday, April 12, 2021 @ 16:03:31
  Author: seblu
Revision: 915896

upgpkg: docker 1:20.10.6-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-04-12 16:01:31 UTC (rev 915895)
+++ PKGBUILD2021-04-12 16:03:31 UTC (rev 915896)
@@ -2,7 +2,7 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.5
+pkgver=20.10.6
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -16,7 +16,7 @@
 'pigz: parallel gzip compressor support')
 # https://github.com/moby/moby/tree/v20.10.0/hack/dockerfile/install
 _TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
-_LIBNETWORK_COMMIT=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+_LIBNETWORK_COMMIT=b3507428be5b458cb0e2b4086b13531fb0706e46
 _BUILDX_COMMIT=11057da37336192bfc57d81e02359ba7ba848e4a
 _APP_COMMIT=9d2c67f87b7338eb1a0fa2f18eb81af3d2aac0e1
 source=("git+https://github.com/docker/cli.git#tag=v$pkgver;

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-03-03 Thread Morten Linderud via arch-commits 
Date: Wednesday, March 3, 2021 @ 16:58:16
  Author: foxboron
Revision: 879312

upgpkg: docker 1:20.10.5-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-03-03 16:47:58 UTC (rev 879311)
+++ PKGBUILD2021-03-03 16:58:16 UTC (rev 879312)
@@ -2,7 +2,7 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.4
+pkgver=20.10.5
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-02-27 Thread Morten Linderud via arch-commits 
Date: Saturday, February 27, 2021 @ 12:34:36
  Author: foxboron
Revision: 874905

upgpkg: docker 1:20.10.4-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |   10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-02-27 12:32:41 UTC (rev 874904)
+++ PKGBUILD2021-02-27 12:34:36 UTC (rev 874905)
@@ -2,8 +2,8 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.3
-pkgrel=3
+pkgver=20.10.4
+pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
 arch=('x86_64')
@@ -34,12 +34,6 @@
 'SKIP'
 '541826011a9836d05a2f42293d5f1beadf2ca8d89fb604487d61a013505678eb')
 
-prepare(){
-  cd cli
-  sed -i 's/-v md2man/-v go-md2man/' scripts/docs/generate-man.sh
-  sed -i 's/md2man/go-md2man/' man/md2man-all.sh
-}
-
 # create a fake go path directory and pushd into it
 # $1 real directory
 # $2 gopath directory

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-02-21 Thread Morten Linderud via arch-commits 
Date: Sunday, February 21, 2021 @ 15:43:15
  Author: foxboron
Revision: 867721

upgpkg: docker 1:20.10.3-3 - Go 1.16 rebuild

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-02-21 15:42:13 UTC (rev 867720)
+++ PKGBUILD2021-02-21 15:43:15 UTC (rev 867721)
@@ -3,7 +3,7 @@
 
 pkgname=docker
 pkgver=20.10.3
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
 arch=('x86_64')

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-02-02 Thread Christian Hesse via arch-commits 
Date: Tuesday, February 2, 2021 @ 19:57:30
  Author: eworm
Revision: 841488

upgpkg: docker 1:20.10.3-2: lvm2 2.03.x rebuild

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-02-02 19:56:42 UTC (rev 841487)
+++ PKGBUILD2021-02-02 19:57:30 UTC (rev 841488)
@@ -3,7 +3,7 @@
 
 pkgname=docker
 pkgver=20.10.3
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
 arch=('x86_64')

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-02-01 Thread Sébastien Luttringer via arch-commits 
Date: Tuesday, February 2, 2021 @ 02:41:35
  Author: seblu
Revision: 840950

upgpkg: docker 1:20.10.3-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-02-02 01:28:44 UTC (rev 840949)
+++ PKGBUILD2021-02-02 02:41:35 UTC (rev 840950)
@@ -2,8 +2,8 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.2
-pkgrel=4
+pkgver=20.10.3
+pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
 arch=('x86_64')

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-01-19 Thread Sébastien Luttringer via arch-commits 
Date: Tuesday, January 19, 2021 @ 17:27:10
  Author: seblu
Revision: 823772

upgpkg: docker 1:20.10.2-4

- Revert fix from FS#69258. Introduce another issue.
- Prevent module outside of GOPATH dowloading (GO111MODULE=off)

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-01-19 17:27:06 UTC (rev 823771)
+++ PKGBUILD2021-01-19 17:27:10 UTC (rev 823772)
@@ -3,7 +3,7 @@
 
 pkgname=docker
 pkgver=20.10.2
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
 arch=('x86_64')
@@ -25,7 +25,6 @@
 "git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT;
 "git+https://github.com/docker/buildx.git#commit=$_BUILDX_COMMIT;
 "git+https://github.com/docker/app.git#commit=$_APP_COMMIT;
-
'https://github.com/moby/libnetwork/commit/c3fabc6892002c6cd556c37330eb95d1d84b2d9c.patch'
 "$pkgname.sysusers")
 sha256sums=('SKIP'
 'SKIP'
@@ -33,12 +32,9 @@
 'SKIP'
 'SKIP'
 'SKIP'
-'0c9e0065b8b67f771971b32bc1a8893f697e8f3c59c5dab5964da8528c8db174'
 '541826011a9836d05a2f42293d5f1beadf2ca8d89fb604487d61a013505678eb')
 
 prepare(){
-  # fix FS#69258
-  patch -d moby/vendor/github.com/docker/libnetwork -p 1 < 
c3fabc6892002c6cd556c37330eb95d1d84b2d9c.patch
   cd cli
   sed -i 's/-v md2man/-v go-md2man/' scripts/docs/generate-man.sh
   sed -i 's/md2man/go-md2man/' man/md2man-all.sh
@@ -88,6 +84,7 @@
   export CGO_LDFLAGS="${LDFLAGS}"
   export LDFLAGS=''
   export GOFLAGS='-buildmode=pie -trimpath -mod=readonly -modcacherw 
-ldflags=-linkmode=external'
+  export GO111MODULE=off
 
   ### cli
   echo 'Building cli'

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-01-18 Thread Sébastien Luttringer via arch-commits 
Date: Tuesday, January 19, 2021 @ 04:10:52
  Author: seblu
Revision: 823652

upgpkg: docker 1:20.10.2-3

Really fix FS#69258

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-01-19 03:40:18 UTC (rev 823651)
+++ PKGBUILD2021-01-19 04:10:52 UTC (rev 823652)
@@ -3,7 +3,7 @@
 
 pkgname=docker
 pkgver=20.10.2
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
 arch=('x86_64')
@@ -25,7 +25,7 @@
 "git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT;
 "git+https://github.com/docker/buildx.git#commit=$_BUILDX_COMMIT;
 "git+https://github.com/docker/app.git#commit=$_APP_COMMIT;
-
'https://github.com/moby/libnetwork/commit/c9ca976ccbab6ba9159c521cfd9093cba490b1c3.patch'
+
'https://github.com/moby/libnetwork/commit/c3fabc6892002c6cd556c37330eb95d1d84b2d9c.patch'
 "$pkgname.sysusers")
 sha256sums=('SKIP'
 'SKIP'
@@ -33,12 +33,12 @@
 'SKIP'
 'SKIP'
 'SKIP'
-'8db14ae0af84bdd7a892b907a118875c3c08003ef7ccbb0c1a11bbe8e00260ae'
+'0c9e0065b8b67f771971b32bc1a8893f697e8f3c59c5dab5964da8528c8db174'
 '541826011a9836d05a2f42293d5f1beadf2ca8d89fb604487d61a013505678eb')
 
 prepare(){
   # fix FS#69258
-  patch -d libnetwork -p 1 < c9ca976ccbab6ba9159c521cfd9093cba490b1c3.patch
+  patch -d moby/vendor/github.com/docker/libnetwork -p 1 < 
c3fabc6892002c6cd556c37330eb95d1d84b2d9c.patch
   cd cli
   sed -i 's/-v md2man/-v go-md2man/' scripts/docs/generate-man.sh
   sed -i 's/md2man/go-md2man/' man/md2man-all.sh

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-01-13 Thread Sébastien Luttringer via arch-commits 
Date: Thursday, January 14, 2021 @ 00:20:47
  Author: seblu
Revision: 820749

upgpkg: docker 1:20.10.2-2

- fix FS#69258

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |   39 ---
 1 file changed, 32 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-01-13 22:41:01 UTC (rev 820748)
+++ PKGBUILD2021-01-14 00:20:47 UTC (rev 820749)
@@ -3,7 +3,7 @@
 
 pkgname=docker
 pkgver=20.10.2
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
 arch=('x86_64')
@@ -25,6 +25,7 @@
 "git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT;
 "git+https://github.com/docker/buildx.git#commit=$_BUILDX_COMMIT;
 "git+https://github.com/docker/app.git#commit=$_APP_COMMIT;
+
'https://github.com/moby/libnetwork/commit/c9ca976ccbab6ba9159c521cfd9093cba490b1c3.patch'
 "$pkgname.sysusers")
 sha256sums=('SKIP'
 'SKIP'
@@ -32,9 +33,12 @@
 'SKIP'
 'SKIP'
 'SKIP'
+'8db14ae0af84bdd7a892b907a118875c3c08003ef7ccbb0c1a11bbe8e00260ae'
 '541826011a9836d05a2f42293d5f1beadf2ca8d89fb604487d61a013505678eb')
 
 prepare(){
+  # fix FS#69258
+  patch -d libnetwork -p 1 < c9ca976ccbab6ba9159c521cfd9093cba490b1c3.patch
   cd cli
   sed -i 's/-v md2man/-v go-md2man/' scripts/docs/generate-man.sh
   sed -i 's/md2man/go-md2man/' man/md2man-all.sh
@@ -55,6 +59,26 @@
 }
 
 build() {
+  ### check my mistakes on commit version
+  echo 'Checking commit mismatch'
+  (
+  local _cfile
+  for _cfile in tini proxy; do
+. "moby/hack/dockerfile/install/$_cfile.installer"
+  done
+  local _commit _pkgbuild _dockerfile
+  err=0
+  for _commit in LIBNETWORK TINI; do
+_pkgbuild=_${_commit}_COMMIT
+_dockerfile=${_commit}_COMMIT
+if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then
+  echo "Invalid $_commit commit, should be ${!_dockerfile}" >&2
+  err=$(($err + 1))
+fi
+  done
+  return $err
+  )
+
   ### globals
   export GOPATH="$srcdir"
   export PATH="$GOPATH/bin:$PATH"
@@ -62,8 +86,8 @@
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
   export CGO_LDFLAGS="${LDFLAGS}"
-  export LDFLAGS=""
-  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw 
-ldflags=-linkmode=external"
+  export LDFLAGS=''
+  export GOFLAGS='-buildmode=pie -trimpath -mod=readonly -modcacherw 
-ldflags=-linkmode=external'
 
   ### cli
   echo 'Building cli'
@@ -104,10 +128,11 @@
   ### buildx cli plugin
   echo 'Building buildx cli plugin'
   _fake_gopath_pushd buildx github.com/docker/buildx
-  go build -o docker-buildx -ldflags "-X 
github.com/docker/buildx/version.Version=$(git describe --match 'v[0-9]*' 
--always --tags)-tp-docker \
-  -X 
github.com/docker/buildx/version.Revision=$(git rev-parse HEAD) \
-  -X 
github.com/docker/buildx/version.Package=github.com/docker/buildx \
-  -X main.experimental=1 
-linkmode=external" ./cmd/buildx
+  go build -o docker-buildx -ldflags "\
+-X github.com/docker/buildx/version.Version=$(git describe --match 
'v[0-9]*' --always --tags)-tp-docker \
+-X github.com/docker/buildx/version.Revision=$(git rev-parse HEAD) \
+-X github.com/docker/buildx/version.Package=github.com/docker/buildx \
+-X main.experimental=1 -linkmode=external" ./cmd/buildx
   _fake_gopath_popd
 
 }

[arch-commits] Commit in docker/trunk (PKGBUILD)

2021-01-05 Thread Morten Linderud via arch-commits 
Date: Tuesday, January 5, 2021 @ 20:55:05
  Author: foxboron
Revision: 809812

upgpkg: docker 1:20.10.2-1

Modified:
  docker/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-01-05 20:21:02 UTC (rev 809811)
+++ PKGBUILD2021-01-05 20:55:05 UTC (rev 809812)
@@ -2,7 +2,7 @@
 # Maintainer: Morten Linderud 
 
 pkgname=docker
-pkgver=20.10.1
+pkgver=20.10.2
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -16,7 +16,7 @@
 'pigz: parallel gzip compressor support')
 # https://github.com/moby/moby/tree/v20.10.0/hack/dockerfile/install
 _TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
-_LIBNETWORK_COMMIT=5c6a95bfb20c61571a00f913c6b91959ede84e8d
+_LIBNETWORK_COMMIT=fa125a3512ee0f6187721c88582bf8c4378bd4d7
 _BUILDX_COMMIT=11057da37336192bfc57d81e02359ba7ba848e4a
 _APP_COMMIT=9d2c67f87b7338eb1a0fa2f18eb81af3d2aac0e1
 source=("git+https://github.com/docker/cli.git#tag=v$pkgver;