[arch-commits] Commit in docker/trunk (PKGBUILD)
Sébastien Luttringer
seblu at archlinux.org
Sun Mar 5 12:50:59 UTC 2017
Date: Sunday, March 5, 2017 @ 12:50:58
Author: seblu
Revision: 214948
upgpkg: docker 1:17.03.0-1
- upstream release docker-ce
- fix FS#53108
Modified:
docker/trunk/PKGBUILD
----------+
PKGBUILD | 32 ++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-03-05 11:20:00 UTC (rev 214947)
+++ PKGBUILD 2017-03-05 12:50:58 UTC (rev 214948)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=1.13.1
+pkgver=17.03.0
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -10,7 +10,7 @@
url='https://www.docker.com/'
license=('Apache')
depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd' 'libseccomp')
-makedepends=('git' 'go' 'btrfs-progs' 'go-md2man')
+makedepends=('git' 'go' 'btrfs-progs' 'go-md2man' 'cmake')
optdepends=('btrfs-progs: btrfs backend support'
'lxc: lxc backend support')
# don't strip binaries! A sha1 is used to check binary consistency.
@@ -18,18 +18,21 @@
# 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
+_RUNC_COMMIT=a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
+_CONTAINERD_COMMIT=977c511eda0925a723debdc94d09459af49d082a
_LIBNETWORK_COMMIT=0f534354b813003a754606689722fe253101bc4e
-source=("git+https://github.com/docker/docker.git#tag=v$pkgver"
+_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
+source=("git+https://github.com/docker/docker.git#tag=v$pkgver-ce"
"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"
+ "git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT"
"$pkgname.sysusers")
md5sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
+ 'SKIP'
'9a8b2744db23b14ca3cd350fdf73c179')
prepare() {
@@ -50,7 +53,7 @@
msg2 'Checking commit mismatch'
. "$srcdir"/docker/hack/dockerfile/binaries-commits
local _commit _pkgbuild _dockerfile
- for _commit in RUNC CONTAINERD LIBNETWORK; do
+ for _commit in RUNC CONTAINERD LIBNETWORK TINI; do
_pkgbuild=_${_commit}_COMMIT
_dockerfile=${_commit}_COMMIT
if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then
@@ -84,6 +87,13 @@
cd src/github.com/docker/libnetwork
go build github.com/docker/libnetwork/cmd/proxy
+ # docker-init
+ msg2 'Building docker-init'
+ cd "$srcdir/tini"
+ cmake .
+ # we must use the static binary because it's started in a foreign os
+ make tini-static
+
# docker
msg2 'Building docker'
cd "$srcdir"/docker
@@ -96,16 +106,18 @@
package() {
# runc
install -Dm755 runc/runc "$pkgdir/usr/bin/docker-runc"
- # containerd
+ # docker-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
+ # docker-proxy
install -Dm755 libnetwork/proxy "$pkgdir/usr/bin/docker-proxy"
+ # docker-init
+ install -Dm755 tini/tini-static "$pkgdir/usr/bin/docker-init"
# 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"
+ install -Dm755 "bundles/latest/dynbinary-client/docker" "$pkgdir/usr/bin/docker"
+ install -Dm755 "bundles/latest/dynbinary-daemon/dockerd" "$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"
More information about the arch-commits
mailing list