Date: Thursday, November 8, 2018 @ 19:55:17 Author: seblu Revision: 404153
upgpkg: docker 1:18.09.0-1 Modified: docker/trunk/PKGBUILD ----------+ PKGBUILD | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-11-08 19:33:44 UTC (rev 404152) +++ PKGBUILD 2018-11-08 19:55:17 UTC (rev 404153) @@ -1,7 +1,7 @@ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=18.06.1 +pkgver=18.09.0 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container' @@ -14,6 +14,7 @@ optdepends=('btrfs-progs: btrfs backend support' 'lxc: lxc backend support' 'pigz: parallel gzip compressor support') +conflicts=('containerd' 'runc') # don't strip binaries! A sha1 is used to check binary consistency. options=('!strip' '!buildflags') # Use exact commit version from Dockerfile, see them in: @@ -21,8 +22,8 @@ _RUNC_COMMIT=69663f0bd4b60df09991c08812a60108003fa340 _CONTAINERD_COMMIT=468a545b9edcd5932818eb9de8e72413e616e86e _TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662 -_LIBNETWORK_COMMIT=3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b -source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver-ce" +_LIBNETWORK_COMMIT=6da50d1978302f04c3e2089e29112ea24812f05b +source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver" "git+https://github.com/opencontainers/runc.git#commit=$_RUNC_COMMIT" "git+https://github.com/containerd/containerd.git#commit=$_CONTAINERD_COMMIT" "git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT" @@ -136,12 +137,11 @@ package() { ### runc - install -Dm755 runc/runc "$pkgdir/usr/bin/docker-runc" + install -Dm755 runc/runc "$pkgdir/usr/bin/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 {containerd,"$pkgdir"/usr}/bin/containerd + install -Dm755 {containerd,"$pkgdir"/usr}/bin/containerd-shim + install -Dm755 {containerd,"$pkgdir"/usr}/bin/ctr ### proxy install -Dm755 libnetwork/proxy "$pkgdir/usr/bin/docker-proxy" ### init