Date: Friday, August 19, 2016 @ 00:12:00
Author: seblu
Revision: 186983
upgpkg: docker 1:1.12.1-1
- fix FS#50430
- fix FS#49950
Modified:
docker/trunk/PKGBUILD
----------+
PKGBUILD | 49 +++++++++++++++++++++++++++++++++++++++----------
1 file changed, 39 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-08-19 00:07:55 UTC (rev 186982)
+++ PKGBUILD 2016-08-19 00:12:00 UTC (rev 186983)
@@ -2,14 +2,14 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=1.11.2
-pkgrel=2
+pkgver=1.12.1
+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=('runc' 'containerd' 'bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd' 'libseccomp')
+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')
@@ -16,9 +16,15 @@
# don't strip binaries! A sha1 is used to check binary consistency.
options=('!strip')
install=$pkgname.install
+# 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'
'8cf9900ebada61f352a03465a088da34')
prepare() {
@@ -35,7 +41,26 @@
}
build() {
- cd docker
+ 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
@@ -48,13 +73,16 @@
#}
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/docker-$pkgver" "$pkgdir/usr/bin/docker"
- # symlink containerd/run (nice integration...)
- ln -s containerd "$pkgdir/usr/bin/docker-containerd"
- ln -s containerd-shim "$pkgdir/usr/bin/docker-containerd-shim"
- ln -s ctr "$pkgdir/usr/bin/docker-containerd-ctr"
- ln -s runc "$pkgdir/usr/bin/docker-runc"
+ 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"
@@ -62,6 +90,7 @@
# 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"