diff options
| -rw-r--r-- | system/docker/docker.SlackBuild | 15 | ||||
| -rw-r--r-- | system/docker/docker.info | 6 |
2 files changed, 11 insertions, 10 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 diff --git a/system/docker/docker.info b/system/docker/docker.info index 8622c14174..4ad557fac2 100644 --- a/system/docker/docker.info +++ b/system/docker/docker.info @@ -1,10 +1,10 @@ PRGNAM="docker" -VERSION="17.09.1" +VERSION="18.03.0" HOMEPAGE="https://www.docker.com/community-edition" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/docker/docker-ce/archive/v17.09.1-ce/docker-ce-17.09.1-ce.tar.gz" -MD5SUM_x86_64="884c749b6d8687deacd65a1412060776" +DOWNLOAD_x86_64="https://github.com/docker/docker-ce/archive/v18.03.0-ce/docker-ce-18.03.0-ce.tar.gz" +MD5SUM_x86_64="e02c511acf83e4478dab64937e540a71" REQUIRES="containerd docker-proxy tini" MAINTAINER="Audrius Kažukauskas" EMAIL="audrius@neutrino.lt" |