Date: Thursday, March 24, 2022 @ 09:03:08
Author: seblu
Revision: 1173895
archrelease: copy trunk to community-x86_64
Added:
docker/repos/community-x86_64/PKGBUILD
(from rev 1173894, docker/trunk/PKGBUILD)
docker/repos/community-x86_64/docker.sysusers
(from rev 1173894, docker/trunk/docker.sysusers)
Deleted:
docker/repos/community-x86_64/PKGBUILD
docker/repos/community-x86_64/docker.sysusers
-----------------+
PKGBUILD | 312 +++++++++++++++++++++++++++---------------------------
docker.sysusers | 2
2 files changed, 157 insertions(+), 157 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-24 09:03:03 UTC (rev 1173894)
+++ PKGBUILD 2022-03-24 09:03:08 UTC (rev 1173895)
@@ -1,156 +0,0 @@
-# Maintainer: Sébastien "Seblu" Luttringer
-# Maintainer: Morten Linderud <foxbo...@archlinux.org>
-
-pkgname=docker
-pkgver=20.10.13
-pkgrel=1
-epoch=1
-pkgdesc='Pack, ship and run any application as a lightweight container'
-arch=('x86_64')
-url='https://www.docker.com/'
-license=('Apache')
-depends=('glibc' 'bridge-utils' 'iproute2' 'device-mapper' 'sqlite'
'systemd-libs'
- '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'
- 'docker-scan: vulnerability scanner')
-# https://github.com/moby/moby/tree/v20.10.0/hack/dockerfile/install
-_TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
-_LIBNETWORK_COMMIT=64b7a4574d1426139437d20e81c0b6d391130ec8
-# TODO: Split into `docker-buildx` and make it a dependency
-_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";
- "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
-# $1 real directory
-# $2 gopath directory
-_fake_gopath_pushd() {
- mkdir -p "$GOPATH/src/${2%/*}"
- rm -f "$GOPATH/src/$2"
- ln -rsT "$1" "$GOPATH/src/$2"
- pushd "$GOPATH/src/$2" >/dev/null
-}
-
-_fake_gopath_popd() {
- popd >/dev/null
-}
-
-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
- # 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
- )
-
- ### globals
- export GOPATH="$srcdir"
- export PATH="$GOPATH/bin:$PATH"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- 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 GO111MODULE=off
- export DISABLE_WARN_OUTSIDE_CONTAINER=1
-
- ### cli
- echo 'Building cli'
- _fake_gopath_pushd cli github.com/docker/cli
- make VERSION=$pkgver dynbinary
- make manpages
- _fake_gopath_popd
-
- ### daemon
- echo 'Building daemon'
- _fake_gopath_pushd moby github.com/docker/docker
- DOCKER_GITCOMMIT=$(cd "$srcdir"/moby && git rev-parse --short HEAD) \
- DOCKER_BUILDTAGS='seccomp journald apparmor' \
- VERSION=$pkgver \
- hack/make.sh dynbinary
- _fake_gopath_popd
-
- ### docker proxy
- echo 'Building docker-proxy'
- _fake_gopath_pushd libnetwork github.com/docker/libnetwork
- go build github.com/docker/libnetwork/cmd/proxy
- _fake_gopath_popd
-
- ### docker-init
- echo 'Building docker-init'
- _fake_gopath_pushd tini github.com/krallin/tini
- cmake .
- # 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() {
- ### proxy
- install -Dm755 libnetwork/proxy "$pkgdir/usr/bin/docker-proxy"
- ### init
- install -Dm755 tini/tini-static "$pkgdir/usr/bin/docker-init"
- ### dockerd
- install -Dm755 moby/bundles/dynbinary-daemon/dockerd
"$pkgdir"/usr/bin/dockerd
- ### systemd units
- cd "$srcdir"/moby/contrib
- install -Dm644 'init/systemd/docker.service'
"$pkgdir/usr/lib/systemd/system/docker.service"
- install -Dm644 'init/systemd/docker.socket'
"$pkgdir/usr/lib/systemd/system/docker.socket"
- # systemd rules
- install -Dm644 'udev/80-docker.rules'
"$pkgdir/usr/lib/udev/rules.d/80-docker.rules"
- install -Dm644 "$srcdir/$pkgname.sysusers"
"$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
- ### cli
- cd "$srcdir"/cli
- # binary
- install -Dm755 build/docker "$pkgdir/usr/bin/docker"
- # completion
- install -Dm644 'contrib/completion/bash/docker'
"$pkgdir/usr/share/bash-completion/completions/docker"
- install -Dm644 'contrib/completion/zsh/_docker'
"$pkgdir/usr/share/zsh/site-functions/_docker"
- install -Dm644 'contrib/completion/fish/docker.fish'
"$pkgdir/usr/share/fish/vendor_completions.d/docker.fish"
- # 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:
Copied: docker/repos/community-x86_64/PKGBUILD (from rev 1173894,
docker/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-03-24 09:03:08 UTC (rev 1173895)
@@ -0,0 +1,156 @@
+# Maintainer: Sébastien "Seblu" Luttringer
+# Maintainer: Morten Linderud <foxbo...@archlinux.org>
+
+pkgname=docker
+pkgver=20.10.14
+pkgrel=1
+epoch=1
+pkgdesc='Pack, ship and run any application as a lightweight container'
+arch=('x86_64')
+url='https://www.docker.com/'
+license=('Apache')
+depends=('glibc' 'bridge-utils' 'iproute2' 'device-mapper' 'sqlite'
'systemd-libs'
+ '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'
+ 'docker-scan: vulnerability scanner')
+# https://github.com/moby/moby/tree/v20.10.0/hack/dockerfile/install
+_TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
+_LIBNETWORK_COMMIT=64b7a4574d1426139437d20e81c0b6d391130ec8
+# TODO: Split into `docker-buildx` and make it a dependency
+_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";
+ "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
+# $1 real directory
+# $2 gopath directory
+_fake_gopath_pushd() {
+ mkdir -p "$GOPATH/src/${2%/*}"
+ rm -f "$GOPATH/src/$2"
+ ln -rsT "$1" "$GOPATH/src/$2"
+ pushd "$GOPATH/src/$2" >/dev/null
+}
+
+_fake_gopath_popd() {
+ popd >/dev/null
+}
+
+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
+ # FIXME: Do not check TINI anymore, use tag instead of commit
+ for _commit in LIBNETWORK; 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"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ 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 GO111MODULE=off
+ export DISABLE_WARN_OUTSIDE_CONTAINER=1
+
+ ### cli
+ echo 'Building cli'
+ _fake_gopath_pushd cli github.com/docker/cli
+ make VERSION=$pkgver dynbinary
+ make manpages
+ _fake_gopath_popd
+
+ ### daemon
+ echo 'Building daemon'
+ _fake_gopath_pushd moby github.com/docker/docker
+ DOCKER_GITCOMMIT=$(cd "$srcdir"/moby && git rev-parse --short HEAD) \
+ DOCKER_BUILDTAGS='seccomp journald apparmor' \
+ VERSION=$pkgver \
+ hack/make.sh dynbinary
+ _fake_gopath_popd
+
+ ### docker proxy
+ echo 'Building docker-proxy'
+ _fake_gopath_pushd libnetwork github.com/docker/libnetwork
+ go build github.com/docker/libnetwork/cmd/proxy
+ _fake_gopath_popd
+
+ ### docker-init
+ echo 'Building docker-init'
+ _fake_gopath_pushd tini github.com/krallin/tini
+ cmake .
+ # 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() {
+ ### proxy
+ install -Dm755 libnetwork/proxy "$pkgdir/usr/bin/docker-proxy"
+ ### init
+ install -Dm755 tini/tini-static "$pkgdir/usr/bin/docker-init"
+ ### dockerd
+ install -Dm755 moby/bundles/dynbinary-daemon/dockerd
"$pkgdir"/usr/bin/dockerd
+ ### systemd units
+ cd "$srcdir"/moby/contrib
+ install -Dm644 'init/systemd/docker.service'
"$pkgdir/usr/lib/systemd/system/docker.service"
+ install -Dm644 'init/systemd/docker.socket'
"$pkgdir/usr/lib/systemd/system/docker.socket"
+ # systemd rules
+ install -Dm644 'udev/80-docker.rules'
"$pkgdir/usr/lib/udev/rules.d/80-docker.rules"
+ install -Dm644 "$srcdir/$pkgname.sysusers"
"$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+ ### cli
+ cd "$srcdir"/cli
+ # binary
+ install -Dm755 build/docker "$pkgdir/usr/bin/docker"
+ # completion
+ install -Dm644 'contrib/completion/bash/docker'
"$pkgdir/usr/share/bash-completion/completions/docker"
+ install -Dm644 'contrib/completion/zsh/_docker'
"$pkgdir/usr/share/zsh/site-functions/_docker"
+ install -Dm644 'contrib/completion/fish/docker.fish'
"$pkgdir/usr/share/fish/vendor_completions.d/docker.fish"
+ # 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:
Deleted: docker.sysusers
===================================================================
--- docker.sysusers 2022-03-24 09:03:03 UTC (rev 1173894)
+++ docker.sysusers 2022-03-24 09:03:08 UTC (rev 1173895)
@@ -1 +0,0 @@
-g docker - -
Copied: docker/repos/community-x86_64/docker.sysusers (from rev 1173894,
docker/trunk/docker.sysusers)
===================================================================
--- docker.sysusers (rev 0)
+++ docker.sysusers 2022-03-24 09:03:08 UTC (rev 1173895)
@@ -0,0 +1 @@
+g docker - -
