From 58e712df58bb486b17f31e952e2fd69b7404a238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Audrius=20Ka=C5=BEukauskas?= Date: Sat, 31 Mar 2018 17:28:43 +0300 Subject: system/docker: Updated for version 18.03.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Audrius Kažukauskas --- system/docker/docker.SlackBuild | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'system/docker/docker.SlackBuild') diff --git a/system/docker/docker.SlackBuild b/system/docker/docker.SlackBuild index e41a38b080..4cda2cfad4 100644 --- a/system/docker/docker.SlackBuild +++ b/system/docker/docker.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for docker # Copyright 2014-2015 Vincent Batts -# Copyright 2017 Audrius Kažukauskas +# Copyright 2017-2018 Audrius Kažukauskas # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=docker -VERSION=${VERSION:-17.09.1} -GITHASH=${GITHASH:-19e2cf6} +VERSION=${VERSION:-18.03.0} +GITHASH=${GITHASH:-0520e24} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,23 +70,24 @@ mkdir -p build/src/github.com/docker cd components/engine DOCKER_GITCOMMIT=$GITHASH \ DOCKER_BUILDTAGS="seccomp" \ +VERSION=$(cat ../../VERSION) \ GOPATH=$TMP/$SRCNAM-$SRCVER/build \ ./hack/make.sh dynbinary -install -D -m 0755 bundles/$SRCVER/dynbinary-daemon/dockerd-$SRCVER \ +install -D -m 0755 $(readlink -f bundles/latest/dynbinary-daemon/dockerd) \ $PKG/usr/bin/dockerd -cd ../.. +cd - # Build CLI. cd components/cli DISABLE_WARN_OUTSIDE_CONTAINER=1 \ make dynbinary \ GITCOMMIT=$GITHASH \ - VERSION=$(cat VERSION) \ + VERSION=$(cat ../../VERSION) \ GOPATH=$TMP/$SRCNAM-$SRCVER/build install -D -m 0755 build/docker-linux-amd64 $PKG/usr/bin/docker -cd ../.. +cd - # Integrate required components. ln -s runc $PKG/usr/bin/docker-runc -- cgit v1.2.3