Date: Sunday, February 12, 2017 @ 01:47:40 Author: seblu Revision: 211971
archrelease: copy trunk to community-x86_64, community-i686 Added: docker/repos/community-i686/PKGBUILD (from rev 211970, docker/trunk/PKGBUILD) docker/repos/community-i686/docker.sysusers (from rev 211970, docker/trunk/docker.sysusers) docker/repos/community-x86_64/PKGBUILD (from rev 211970, docker/trunk/PKGBUILD) docker/repos/community-x86_64/docker.sysusers (from rev 211970, docker/trunk/docker.sysusers) Deleted: docker/repos/community-i686/PKGBUILD docker/repos/community-i686/docker.sysusers docker/repos/community-x86_64/PKGBUILD docker/repos/community-x86_64/docker.sysusers ----------------------------------+ /PKGBUILD | 252 +++++++++++++++++++++++++++++++++++++ /docker.sysusers | 4 community-i686/PKGBUILD | 102 -------------- community-i686/docker.sysusers | 2 community-x86_64/PKGBUILD | 102 -------------- community-x86_64/docker.sysusers | 2 6 files changed, 256 insertions(+), 208 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-02-12 01:47:03 UTC (rev 211970) +++ community-i686/PKGBUILD 2017-02-12 01:47:40 UTC (rev 211971) @@ -1,102 +0,0 @@ -# $Id$ -# Maintainer: Sébastien "Seblu" Luttringer - -pkgname=docker -pkgver=1.12.6 -pkgrel=1 -epoch=1 -pkgdesc='Pack, ship and run any application as a lightweight container' -arch=('x86_64' 'i686') -url='https://www.docker.com/' -license=('Apache') -depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd' 'libseccomp') -makedepends=('git' 'go' 'btrfs-progs' 'go-md2man') -optdepends=('btrfs-progs: btrfs backend support' - 'lxc: lxc backend support') -# don't strip binaries! A sha1 is used to check binary consistency. -options=('!strip') -# Use exact commit version from Dockerfile for runc and containerd until 1.0.0 -# https://github.com/docker/containerd/issues/299#issuecomment-240745119 -source=("git+https://github.com/docker/docker.git#tag=v$pkgver" - 'git+https://github.com/opencontainers/runc.git#commit=cc29e3dded8e27ba8f65738f40d251c885030a28' - 'git+https://github.com/docker/containerd.git#commit=0ac3cd1be170d180b2baed755e8f0da547ceb267' - "$pkgname.sysusers") -md5sums=('SKIP' - 'SKIP' - 'SKIP' - '9a8b2744db23b14ca3cd350fdf73c179') - -prepare() { - cd docker - # apply patch from the source array (should be a pacman feature) - local filename - for filename in "${source[@]}"; do - if [[ "$filename" =~ \.patch$ ]]; then - msg2 "Applying patch ${filename##*/}" - patch -p1 -N -i "$srcdir/${filename##*/}" - fi - done - : -} - -build() { - export GOPATH="$srcdir" - - # runc - msg2 'Building runc' - mkdir -p src/github.com/opencontainers - ln -rsf "$srcdir/runc" src/github.com/opencontainers/runc - cd src/github.com/opencontainers/runc - make BUILDTAGS='seccomp' - - # containerd - msg2 'Building containerd' - cd "$srcdir" - mkdir -p src/github.com/docker - ln -rsf containerd src/github.com/docker - cd src/github.com/docker/containerd - LDFLAGS= make - - # docker - msg2 'Building docker' - cd "$srcdir"/docker - export AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp' - hack/make.sh dynbinary - # man pages - man/md2man-all.sh 2>/dev/null -} - -#check() { -# cd docker -# ./hack/make.sh dyntest -#} - -package() { - # runc & containerd - install -Dm755 containerd/bin/containerd "$pkgdir/usr/bin/docker-containerd" - install -Dm755 containerd/bin/containerd-shim "$pkgdir/usr/bin/docker-containerd-shim" - install -Dm755 containerd/bin/ctr "$pkgdir/usr/bin/docker-containerd-ctr" - install -Dm755 runc/runc "$pkgdir/usr/bin/docker-runc" - # docker binary - cd docker - install -Dm755 "bundles/$pkgver/dynbinary-client/docker-$pkgver" "$pkgdir/usr/bin/docker" - install -Dm755 "bundles/$pkgver/dynbinary-daemon/docker-proxy-$pkgver" "$pkgdir/usr/bin/docker-proxy" - install -Dm755 "bundles/$pkgver/dynbinary-daemon/dockerd-$pkgver" "$pkgdir/usr/bin/dockerd" - # 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" - # systemd - install -Dm644 'contrib/init/systemd/docker.service' "$pkgdir/usr/lib/systemd/system/docker.service" - install -Dm644 'contrib/init/systemd/docker.socket' "$pkgdir/usr/lib/systemd/system/docker.socket" - install -Dm644 'contrib/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" - # vim syntax - install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/syntax/dockerfile.vim" - install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/ftdetect/dockerfile.vim" - # man - install -dm755 "$pkgdir/usr/share/man" - mv man/man* "$pkgdir/usr/share/man" -} - -# vim:set ts=2 sw=2 et: Copied: docker/repos/community-i686/PKGBUILD (from rev 211970, docker/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-02-12 01:47:40 UTC (rev 211971) @@ -0,0 +1,126 @@ +# $Id$ +# Maintainer: Sébastien "Seblu" Luttringer + +pkgname=docker +pkgver=1.13.1 +pkgrel=1 +epoch=1 +pkgdesc='Pack, ship and run any application as a lightweight container' +arch=('x86_64' 'i686') +url='https://www.docker.com/' +license=('Apache') +depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd' 'libseccomp') +makedepends=('git' 'go' 'btrfs-progs' 'go-md2man') +optdepends=('btrfs-progs: btrfs backend support' + 'lxc: lxc backend support') +# don't strip binaries! A sha1 is used to check binary consistency. +options=('!strip') +# Use exact commit version from Dockerfile for runc and containerd until 1.0.0 +# https://github.com/docker/containerd/issues/299#issuecomment-240745119 +# see commit in hack/dockerfile/binaries-commits +_RUNC_COMMIT=9df8b306d01f59d3a8029be411de015b7304dd8f +_CONTAINERD_COMMIT=aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1 +_LIBNETWORK_COMMIT=0f534354b813003a754606689722fe253101bc4e +source=("git+https://github.com/docker/docker.git#tag=v$pkgver" + "git+https://github.com/docker/runc.git#commit=$_RUNC_COMMIT" + "git+https://github.com/docker/containerd.git#commit=$_CONTAINERD_COMMIT" + "git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT" + "$pkgname.sysusers") +md5sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + '9a8b2744db23b14ca3cd350fdf73c179') + +prepare() { + cd docker + # apply patch from the source array (should be a pacman feature) + local filename + for filename in "${source[@]}"; do + if [[ "$filename" =~ \.patch$ ]]; then + msg2 "Applying patch ${filename##*/}" + patch -p1 -N -i "$srcdir/${filename##*/}" + fi + done + : +} + +build() { + # check packager mistake on commit version + msg2 'Checking commit mismatch' + . "$srcdir"/docker/hack/dockerfile/binaries-commits + local _commit _pkgbuild _dockerfile + for _commit in RUNC CONTAINERD LIBNETWORK; do + _pkgbuild=_${_commit}_COMMIT + _dockerfile=${_commit}_COMMIT + if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then + error "Invalid $_commit commit" + return 1 + fi + done + + # go + export GOPATH="$srcdir" + + # runc + msg2 'Building runc' + mkdir -p src/github.com/opencontainers + ln -rsf "$srcdir/runc" src/github.com/opencontainers/runc + cd src/github.com/opencontainers/runc + make BUILDTAGS='seccomp' + + # containerd + msg2 'Building containerd' + cd "$srcdir" + mkdir -p src/github.com/docker + ln -rsf containerd src/github.com/docker + cd src/github.com/docker/containerd + LDFLAGS= make + + # docker proxy + msg2 'Building docker-proxy' + cd "$srcdir" + ln -rsf libnetwork src/github.com/docker + cd src/github.com/docker/libnetwork + go build github.com/docker/libnetwork/cmd/proxy + + # docker + msg2 'Building docker' + cd "$srcdir"/docker + export AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp' + hack/make.sh dynbinary + # man pages + man/md2man-all.sh 2>/dev/null +} + +package() { + # runc + install -Dm755 runc/runc "$pkgdir/usr/bin/docker-runc" + # containerd + install -Dm755 containerd/bin/containerd "$pkgdir/usr/bin/docker-containerd" + install -Dm755 containerd/bin/containerd-shim "$pkgdir/usr/bin/docker-containerd-shim" + install -Dm755 containerd/bin/ctr "$pkgdir/usr/bin/docker-containerd-ctr" + # docker proxy + install -Dm755 libnetwork/proxy "$pkgdir/usr/bin/docker-proxy" + # docker binary + cd docker + install -Dm755 "bundles/$pkgver/dynbinary-client/docker-$pkgver" "$pkgdir/usr/bin/docker" + install -Dm755 "bundles/$pkgver/dynbinary-daemon/dockerd-$pkgver" "$pkgdir/usr/bin/dockerd" + # 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" + # systemd + install -Dm644 'contrib/init/systemd/docker.service' "$pkgdir/usr/lib/systemd/system/docker.service" + install -Dm644 'contrib/init/systemd/docker.socket' "$pkgdir/usr/lib/systemd/system/docker.socket" + install -Dm644 'contrib/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" + # vim syntax + install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/syntax/dockerfile.vim" + install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/ftdetect/dockerfile.vim" + # man + install -dm755 "$pkgdir/usr/share/man" + mv man/man* "$pkgdir/usr/share/man" +} + +# vim:set ts=2 sw=2 et: Deleted: community-i686/docker.sysusers =================================================================== --- community-i686/docker.sysusers 2017-02-12 01:47:03 UTC (rev 211970) +++ community-i686/docker.sysusers 2017-02-12 01:47:40 UTC (rev 211971) @@ -1,2 +0,0 @@ -# create docker group (FS#38029) -g docker - - Copied: docker/repos/community-i686/docker.sysusers (from rev 211970, docker/trunk/docker.sysusers) =================================================================== --- community-i686/docker.sysusers (rev 0) +++ community-i686/docker.sysusers 2017-02-12 01:47:40 UTC (rev 211971) @@ -0,0 +1,2 @@ +# create docker group (FS#38029) +g docker - - Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-02-12 01:47:03 UTC (rev 211970) +++ community-x86_64/PKGBUILD 2017-02-12 01:47:40 UTC (rev 211971) @@ -1,102 +0,0 @@ -# $Id$ -# Maintainer: Sébastien "Seblu" Luttringer - -pkgname=docker -pkgver=1.12.6 -pkgrel=1 -epoch=1 -pkgdesc='Pack, ship and run any application as a lightweight container' -arch=('x86_64' 'i686') -url='https://www.docker.com/' -license=('Apache') -depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd' 'libseccomp') -makedepends=('git' 'go' 'btrfs-progs' 'go-md2man') -optdepends=('btrfs-progs: btrfs backend support' - 'lxc: lxc backend support') -# don't strip binaries! A sha1 is used to check binary consistency. -options=('!strip') -# Use exact commit version from Dockerfile for runc and containerd until 1.0.0 -# https://github.com/docker/containerd/issues/299#issuecomment-240745119 -source=("git+https://github.com/docker/docker.git#tag=v$pkgver" - 'git+https://github.com/opencontainers/runc.git#commit=cc29e3dded8e27ba8f65738f40d251c885030a28' - 'git+https://github.com/docker/containerd.git#commit=0ac3cd1be170d180b2baed755e8f0da547ceb267' - "$pkgname.sysusers") -md5sums=('SKIP' - 'SKIP' - 'SKIP' - '9a8b2744db23b14ca3cd350fdf73c179') - -prepare() { - cd docker - # apply patch from the source array (should be a pacman feature) - local filename - for filename in "${source[@]}"; do - if [[ "$filename" =~ \.patch$ ]]; then - msg2 "Applying patch ${filename##*/}" - patch -p1 -N -i "$srcdir/${filename##*/}" - fi - done - : -} - -build() { - export GOPATH="$srcdir" - - # runc - msg2 'Building runc' - mkdir -p src/github.com/opencontainers - ln -rsf "$srcdir/runc" src/github.com/opencontainers/runc - cd src/github.com/opencontainers/runc - make BUILDTAGS='seccomp' - - # containerd - msg2 'Building containerd' - cd "$srcdir" - mkdir -p src/github.com/docker - ln -rsf containerd src/github.com/docker - cd src/github.com/docker/containerd - LDFLAGS= make - - # docker - msg2 'Building docker' - cd "$srcdir"/docker - export AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp' - hack/make.sh dynbinary - # man pages - man/md2man-all.sh 2>/dev/null -} - -#check() { -# cd docker -# ./hack/make.sh dyntest -#} - -package() { - # runc & containerd - install -Dm755 containerd/bin/containerd "$pkgdir/usr/bin/docker-containerd" - install -Dm755 containerd/bin/containerd-shim "$pkgdir/usr/bin/docker-containerd-shim" - install -Dm755 containerd/bin/ctr "$pkgdir/usr/bin/docker-containerd-ctr" - install -Dm755 runc/runc "$pkgdir/usr/bin/docker-runc" - # docker binary - cd docker - install -Dm755 "bundles/$pkgver/dynbinary-client/docker-$pkgver" "$pkgdir/usr/bin/docker" - install -Dm755 "bundles/$pkgver/dynbinary-daemon/docker-proxy-$pkgver" "$pkgdir/usr/bin/docker-proxy" - install -Dm755 "bundles/$pkgver/dynbinary-daemon/dockerd-$pkgver" "$pkgdir/usr/bin/dockerd" - # 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" - # systemd - install -Dm644 'contrib/init/systemd/docker.service' "$pkgdir/usr/lib/systemd/system/docker.service" - install -Dm644 'contrib/init/systemd/docker.socket' "$pkgdir/usr/lib/systemd/system/docker.socket" - install -Dm644 'contrib/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" - # vim syntax - install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/syntax/dockerfile.vim" - install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/ftdetect/dockerfile.vim" - # man - install -dm755 "$pkgdir/usr/share/man" - mv man/man* "$pkgdir/usr/share/man" -} - -# vim:set ts=2 sw=2 et: Copied: docker/repos/community-x86_64/PKGBUILD (from rev 211970, docker/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-02-12 01:47:40 UTC (rev 211971) @@ -0,0 +1,126 @@ +# $Id$ +# Maintainer: Sébastien "Seblu" Luttringer + +pkgname=docker +pkgver=1.13.1 +pkgrel=1 +epoch=1 +pkgdesc='Pack, ship and run any application as a lightweight container' +arch=('x86_64' 'i686') +url='https://www.docker.com/' +license=('Apache') +depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd' 'libseccomp') +makedepends=('git' 'go' 'btrfs-progs' 'go-md2man') +optdepends=('btrfs-progs: btrfs backend support' + 'lxc: lxc backend support') +# don't strip binaries! A sha1 is used to check binary consistency. +options=('!strip') +# Use exact commit version from Dockerfile for runc and containerd until 1.0.0 +# https://github.com/docker/containerd/issues/299#issuecomment-240745119 +# see commit in hack/dockerfile/binaries-commits +_RUNC_COMMIT=9df8b306d01f59d3a8029be411de015b7304dd8f +_CONTAINERD_COMMIT=aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1 +_LIBNETWORK_COMMIT=0f534354b813003a754606689722fe253101bc4e +source=("git+https://github.com/docker/docker.git#tag=v$pkgver" + "git+https://github.com/docker/runc.git#commit=$_RUNC_COMMIT" + "git+https://github.com/docker/containerd.git#commit=$_CONTAINERD_COMMIT" + "git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT" + "$pkgname.sysusers") +md5sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + '9a8b2744db23b14ca3cd350fdf73c179') + +prepare() { + cd docker + # apply patch from the source array (should be a pacman feature) + local filename + for filename in "${source[@]}"; do + if [[ "$filename" =~ \.patch$ ]]; then + msg2 "Applying patch ${filename##*/}" + patch -p1 -N -i "$srcdir/${filename##*/}" + fi + done + : +} + +build() { + # check packager mistake on commit version + msg2 'Checking commit mismatch' + . "$srcdir"/docker/hack/dockerfile/binaries-commits + local _commit _pkgbuild _dockerfile + for _commit in RUNC CONTAINERD LIBNETWORK; do + _pkgbuild=_${_commit}_COMMIT + _dockerfile=${_commit}_COMMIT + if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then + error "Invalid $_commit commit" + return 1 + fi + done + + # go + export GOPATH="$srcdir" + + # runc + msg2 'Building runc' + mkdir -p src/github.com/opencontainers + ln -rsf "$srcdir/runc" src/github.com/opencontainers/runc + cd src/github.com/opencontainers/runc + make BUILDTAGS='seccomp' + + # containerd + msg2 'Building containerd' + cd "$srcdir" + mkdir -p src/github.com/docker + ln -rsf containerd src/github.com/docker + cd src/github.com/docker/containerd + LDFLAGS= make + + # docker proxy + msg2 'Building docker-proxy' + cd "$srcdir" + ln -rsf libnetwork src/github.com/docker + cd src/github.com/docker/libnetwork + go build github.com/docker/libnetwork/cmd/proxy + + # docker + msg2 'Building docker' + cd "$srcdir"/docker + export AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp' + hack/make.sh dynbinary + # man pages + man/md2man-all.sh 2>/dev/null +} + +package() { + # runc + install -Dm755 runc/runc "$pkgdir/usr/bin/docker-runc" + # containerd + install -Dm755 containerd/bin/containerd "$pkgdir/usr/bin/docker-containerd" + install -Dm755 containerd/bin/containerd-shim "$pkgdir/usr/bin/docker-containerd-shim" + install -Dm755 containerd/bin/ctr "$pkgdir/usr/bin/docker-containerd-ctr" + # docker proxy + install -Dm755 libnetwork/proxy "$pkgdir/usr/bin/docker-proxy" + # docker binary + cd docker + install -Dm755 "bundles/$pkgver/dynbinary-client/docker-$pkgver" "$pkgdir/usr/bin/docker" + install -Dm755 "bundles/$pkgver/dynbinary-daemon/dockerd-$pkgver" "$pkgdir/usr/bin/dockerd" + # 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" + # systemd + install -Dm644 'contrib/init/systemd/docker.service' "$pkgdir/usr/lib/systemd/system/docker.service" + install -Dm644 'contrib/init/systemd/docker.socket' "$pkgdir/usr/lib/systemd/system/docker.socket" + install -Dm644 'contrib/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" + # vim syntax + install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/syntax/dockerfile.vim" + install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' "$pkgdir/usr/share/vim/vimfiles/ftdetect/dockerfile.vim" + # man + install -dm755 "$pkgdir/usr/share/man" + mv man/man* "$pkgdir/usr/share/man" +} + +# vim:set ts=2 sw=2 et: Deleted: community-x86_64/docker.sysusers =================================================================== --- community-x86_64/docker.sysusers 2017-02-12 01:47:03 UTC (rev 211970) +++ community-x86_64/docker.sysusers 2017-02-12 01:47:40 UTC (rev 211971) @@ -1,2 +0,0 @@ -# create docker group (FS#38029) -g docker - - Copied: docker/repos/community-x86_64/docker.sysusers (from rev 211970, docker/trunk/docker.sysusers) =================================================================== --- community-x86_64/docker.sysusers (rev 0) +++ community-x86_64/docker.sysusers 2017-02-12 01:47:40 UTC (rev 211971) @@ -0,0 +1,2 @@ +# create docker group (FS#38029) +g docker - -