From d86f3ec83ca4d2efc6a9ad25b57d88d0b1a71486 Mon Sep 17 00:00:00 2001 From: Sir_Boops Date: Mon, 12 Nov 2018 08:06:16 -0700 Subject: [PATCH] docker: update to 18.09.0 --- srcpkgs/docker/template | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template index c454a25d0b8..00650ef5c32 100644 --- a/srcpkgs/docker/template +++ b/srcpkgs/docker/template @@ -1,18 +1,16 @@ # Template file for 'docker' pkgname=docker -version=18.06.1 +version=18.09.0 revision=1 -_subversion='-ce' -_version="$version$_subversion" -wrksrc="$pkgname$_subversion-$_version" +wrksrc="${pkgname}-ce-${version}" hostmakedepends="git go pkg-config curl cmake" makedepends="libbtrfs-devel sqlite-devel device-mapper-devel libseccomp-devel libapparmor-devel libltdl-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/docker/docker-ce/archive/v$_version.tar.gz" -checksum=153cb489033686260dfe7a42acbdd1753d56f7a9c2d7ad90633f0c8cce563b23 +distfiles="https://github.com/docker/docker-ce/archive/v${version}.tar.gz" +checksum=0f251f04b1973956f070c1d7ee2751a9663da2d9d701fbab7e957f0f5f310478 # These are required at run-time. depends="iptables xz git" @@ -31,11 +29,11 @@ do_build() { mkdir -p .gopath/src/github.com/docker ln -sf $wrksrc/components/cli .gopath/src/github.com/docker/ GOPATH=$wrksrc/components/cli/.gopath LDFLAGS='' \ - make VERSION=$_version dynbinary + make VERSION=${version} dynbinary rm -rf .gopath cd ../../components/engine - AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp apparmor' VERSION=$_version DOCKER_GITCOMMIT=v$_version \ + AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp apparmor' VERSION=${version} DOCKER_GITCOMMIT=v${version} \ hack/make.sh dynbinary } @@ -44,7 +42,7 @@ pre_build() { vmkdir usr/bin sed -i "s|/usr/local|$DESTDIR/usr|g" hack/dockerfile/install/install.sh for COMPONENT in $_docker_components; do - AUTO_GOPATH=1 LDFLAGS='' DOCKER_BUILDTAGS='seccomp apparmor' DOCKER_GITCOMMIT=v$_version \ + AUTO_GOPATH=1 LDFLAGS='' DOCKER_BUILDTAGS='seccomp apparmor' DOCKER_GITCOMMIT=v${version} \ hack/dockerfile/install/install.sh $COMPONENT done }