From 807ae0566e8ab5499808661771d86c7abf11395b Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sun, 9 Jul 2017 11:17:25 +0200 Subject: [PATCH] docker: update to 17.06.0. --- srcpkgs/docker/template | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template index 561bbc90364..abdf04b9494 100644 --- a/srcpkgs/docker/template +++ b/srcpkgs/docker/template @@ -1,18 +1,19 @@ # Template file for 'docker' pkgname=docker -version=17.05.0 -revision=2 +version=17.06.0 +revision=1 _subversion='-ce' _version="$version$_subversion" -wrksrc="moby-$_version" +wrksrc="$pkgname$_subversion-$_version" +build_wrksrc="components/engine" hostmakedepends="git go pkg-config cmake" makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel" short_desc="Pack, ship and run any application as a lightweight container" maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="http://www.docker.io" -distfiles="https://github.com/moby/moby/archive/v$_version.tar.gz" -checksum=4716df117d867b82ddab2e82395cd40aa3d0925a689eedcec8919729e4c9f121 +distfiles="https://github.com/docker/docker-ce/archive/v$_version.tar.gz" +checksum=60c2541327a27b03d3a7eaea713d89e8e03a2585f00033c6c662fc60eade57ab # These are required at run-time. depends="iptables xz git" @@ -23,23 +24,23 @@ only_for_archs="x86_64 x86_64-musl" system_groups="docker" do_build() { - export AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp' - export DOCKER_GITCOMMIT=v$_version - hack/make.sh dynbinary + AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp' DOCKER_GITCOMMIT=v$_version \ + hack/make.sh dynbinary } pre_build() { - export GOPATH=$PWD/gopath - mkdir -p $GOPATH vmkdir usr/bin - sed -i "s|/usr/local|$DESTDIR/usr|g; s|apparmor||g" hack/dockerfile/install-binaries.sh - hack/dockerfile/install-binaries.sh runc-dynamic\ - containerd-dynamic\ - tini\ - proxy-dynamic + sed -i "s|/usr/local|$DESTDIR/usr|g; s|apparmor ||g" hack/dockerfile/install-binaries.sh + AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp' DOCKER_GITCOMMIT=v$_version \ + hack/dockerfile/install-binaries.sh \ + runc-dynamic \ + containerd-dynamic \ + tini \ + proxy-dynamic \ + dockercli } + do_install() { - vbin bundles/${_version}/dynbinary-client/docker-${_version} docker vbin bundles/${_version}/dynbinary-daemon/dockerd-${_version} dockerd vinstall contrib/completion/bash/docker 644 usr/share/bash-completion/completions vinstall contrib/completion/zsh/_docker 644 usr/share/zsh/site-functions