diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template index 0653041c88f..8bb756f4f69 100644 --- a/srcpkgs/docker/template +++ b/srcpkgs/docker/template @@ -1,7 +1,7 @@ # Template file for 'docker' pkgname=docker -version=18.02.0 -revision=2 +version=18.05.0 +revision=1 _subversion='-ce' _version="$version$_subversion" wrksrc="$pkgname$_subversion-$_version" @@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="http://www.docker.io" distfiles="https://github.com/docker/docker-ce/archive/v$_version.tar.gz" -checksum=fb2b9db5ec1a7e9eb80913fb7790377bbbb0fe5aad033f498d09bcd15a51a5c2 +checksum=cc29408b382774b9f5967ee33851e97bcb7463aa7358d60004f28b836a70ba75 # These are required at run-time. depends="iptables xz git" @@ -23,6 +23,8 @@ nocross=yes only_for_archs="x86_64 x86_64-musl" system_groups="docker" +_docker_components="runc containerd tini proxy dockercli" + do_build() { AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp' DOCKER_GITCOMMIT=v$_version \ hack/make.sh dynbinary @@ -30,14 +32,11 @@ do_build() { pre_build() { vmkdir usr/bin - sed -i "s|/usr/local|$DESTDIR/usr|g; s|apparmor ||g" hack/dockerfile/install-binaries.sh - AUTO_GOPATH=1 LDFLAGS='' DOCKER_BUILDTAGS='seccomp' DOCKER_GITCOMMIT=v$_version \ - hack/dockerfile/install-binaries.sh \ - runc-dynamic \ - containerd-dynamic \ - tini \ - proxy-dynamic \ - dockercli + sed -i "s|/usr/local|$DESTDIR/usr|g; s|apparmor ||g" hack/dockerfile/install/install.sh + for COMPONENT in $_docker_components; do + AUTO_GOPATH=1 LDFLAGS='' DOCKER_BUILDTAGS='seccomp' DOCKER_GITCOMMIT=v$_version \ + hack/dockerfile/install/install.sh $COMPONENT + done } do_install() {