diff options
Diffstat (limited to 'system/docker/docker.SlackBuild')
| -rw-r--r-- | system/docker/docker.SlackBuild | 15 |
1 files changed, 8 insertions, 7 deletions
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 <vbatts@hashbangbash.com> -# Copyright 2017 Audrius Kažukauskas <audrius@neutrino.lt> +# Copyright 2017-2018 Audrius Kažukauskas <audrius@neutrino.lt> # 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 |