diff options
-rw-r--r-- | system/docker/docker.SlackBuild | 61 | ||||
-rw-r--r-- | system/docker/docker.info | 6 |
2 files changed, 21 insertions, 46 deletions
diff --git a/system/docker/docker.SlackBuild b/system/docker/docker.SlackBuild index 7facf93ef67f..c6631b24874d 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-2020 Audrius Kažukauskas <audrius@neutrino.lt> +# Copyright 2017-2021 Audrius Kažukauskas <audrius@neutrino.lt> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,12 +24,12 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=docker -VERSION=${VERSION:-19.03.8} -GITHASH=${GITHASH:-afacb8b} +VERSION=${VERSION:-20.10.2} +GITHASH=${GITHASH:-8891c58} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -SRCNAM=$PRGNAM-ce +SRCNAM=moby if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -59,34 +59,18 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -mkdir -p build/src/github.com/docker -( cd build/src/github.com/docker - ln -s $TMP/$SRCNAM-$VERSION/components/engine docker - ln -s $TMP/$SRCNAM-$VERSION/components/cli cli -) - -# Build daemon. -cd components/engine - DOCKER_GITCOMMIT=$GITHASH \ - DOCKER_BUILDTAGS="seccomp" \ - VERSION=$(cat ../../VERSION) \ - GOPATH=$TMP/$SRCNAM-$VERSION/build \ - ./hack/make.sh dynbinary - - install -D -m 0755 bundles/dynbinary-daemon/dockerd-$VERSION \ - $PKG/usr/bin/dockerd -cd - - -# Build CLI. -cd components/cli - DISABLE_WARN_OUTSIDE_CONTAINER=1 \ - make dynbinary \ - GITCOMMIT=$GITHASH \ - VERSION=$(cat ../../VERSION) \ - GOPATH=$TMP/$SRCNAM-$VERSION/build - - install -D -m 0755 build/docker-linux-amd64 $PKG/usr/bin/docker -cd - +mkdir build +mv vendor build/src +ln -sf $TMP/$SRCNAM-$VERSION build/src/github.com/docker/docker + +DOCKER_GITCOMMIT=$GITHASH \ +DOCKER_BUILDTAGS="seccomp" \ +VERSION=$VERSION \ +GOPATH=$TMP/$SRCNAM-$VERSION/build \ +./hack/make.sh dynbinary + +install -D -m 0755 bundles/dynbinary-daemon/dockerd-$VERSION \ + $PKG/usr/bin/dockerd # Integrate required components. ln -s runc $PKG/usr/bin/docker-runc @@ -95,25 +79,16 @@ ln -s containerd-shim $PKG/usr/bin/docker-containerd-shim ln -s ctr $PKG/usr/bin/docker-containerd-ctr ln -s tini-static $PKG/usr/bin/docker-init -# Completion. -( cd components/cli/contrib/completion - install -D -m 0644 bash/docker $PKG/usr/share/bash-completion/completions/docker - install -D -m 0644 zsh/_docker $PKG/usr/share/zsh/site-functions/_docker - install -D -m 0644 fish/docker.fish $PKG/usr/share/fish/vendor_completions.d/docker.fish -) - install -D -m 0644 $CWD/config/docker.default $PKG/etc/default/docker.new install -D -m 0644 $CWD/config/docker.logrotate $PKG/etc/logrotate.d/docker.new install -D -m 0644 $CWD/config/rc.docker $PKG/etc/rc.d/rc.docker.new # Install udev rules. -install -D -m 0644 components/engine/contrib/udev/80-docker.rules \ +install -D -m 0644 contrib/udev/80-docker.rules \ $PKG/lib/udev/rules.d/80-docker.rules mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGELOG.md components/engine/LICENSE components/engine/NOTICE README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE NOTICE README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/docker/docker.info b/system/docker/docker.info index 47886a157cde..caf6c4c8b810 100644 --- a/system/docker/docker.info +++ b/system/docker/docker.info @@ -1,10 +1,10 @@ PRGNAM="docker" -VERSION="19.03.8" +VERSION="20.10.2" HOMEPAGE="https://www.docker.com/products/container-runtime" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/docker/docker-ce/archive/v19.03.8/docker-ce-19.03.8.tar.gz" -MD5SUM_x86_64="529b9e0767146ba03b6fda5833b5e1f6" +DOWNLOAD_x86_64="https://github.com/moby/moby/archive/v20.10.2/moby-20.10.2.tar.gz" +MD5SUM_x86_64="4a1025fd2affef73fb32e863ff6873bd" REQUIRES="containerd docker-proxy tini" MAINTAINER="Audrius Kažukauskas" EMAIL="audrius@neutrino.lt" |