diff options
| author | Andrew Clemons <andrew.clemons@gmail.com> | 2022-12-31 14:09:59 +0900 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2023-01-06 22:40:40 +0700 |
| commit | eb28f6ab913c6cf91d958731f51cfe4c4a469b46 (patch) | |
| tree | a1079116881e3de0d9eff9711ea30212c54fb430 /system | |
| parent | e72573c8d342cf53040b3a14092199a35e49fdae (diff) | |
system/docker: Updated for version 20.10.22.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
| -rw-r--r-- | system/docker/44707.patch | 36 | ||||
| -rw-r--r-- | system/docker/docker.SlackBuild | 9 | ||||
| -rw-r--r-- | system/docker/docker.info | 6 |
3 files changed, 43 insertions, 8 deletions
diff --git a/system/docker/44707.patch b/system/docker/44707.patch new file mode 100644 index 000000000000..39d72bcad0fe --- /dev/null +++ b/system/docker/44707.patch @@ -0,0 +1,36 @@ +From ffbbe3d103b045c3f8ec5f74aa71b7a314fd57fe Mon Sep 17 00:00:00 2001 +From: Shengjing Zhu <zhsj@debian.org> +Date: Thu, 29 Dec 2022 02:37:39 +0800 +Subject: [PATCH] daemon/graphdriver/btrfs: workaround field rename in + btrfs-progs 6.1 + +Closes: #44698 + +Signed-off-by: Shengjing Zhu <zhsj@debian.org> +--- + daemon/graphdriver/btrfs/btrfs.go | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go +index 720f1ab0cd43..f2f6bf9e975b 100644 +--- a/daemon/graphdriver/btrfs/btrfs.go ++++ b/daemon/graphdriver/btrfs/btrfs.go +@@ -6,6 +6,9 @@ package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs" + /* + #include <stdlib.h> + #include <dirent.h> ++ ++// keep struct field name compatible with btrfs-progs < 6.1. ++#define max_referenced max_rfer + #include <btrfs/ioctl.h> + #include <btrfs/ctree.h> + +@@ -395,7 +398,7 @@ func subvolLimitQgroup(path string, size uint64) error { + defer closeDir(dir) + + var args C.struct_btrfs_ioctl_qgroup_limit_args +- args.lim.max_referenced = C.__u64(size) ++ args.lim.max_rfer = C.__u64(size) + args.lim.flags = C.BTRFS_QGROUP_LIMIT_MAX_RFER + _, _, errno := unix.Syscall(unix.SYS_IOCTL, getDirFd(dir), C.BTRFS_IOC_QGROUP_LIMIT, + uintptr(unsafe.Pointer(&args))) diff --git a/system/docker/docker.SlackBuild b/system/docker/docker.SlackBuild index e423cc0cfc7d..1881fc4fd2a4 100644 --- a/system/docker/docker.SlackBuild +++ b/system/docker/docker.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=docker -VERSION=${VERSION:-20.10.21} -GITHASH=${GITHASH:-e2f740d} +VERSION=${VERSION:-20.10.22} +GITHASH=${GITHASH:-42c8b31} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -42,9 +42,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -69,6 +66,8 @@ 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 {} \; +patch -p1 < $CWD/44707.patch + mkdir build mv vendor build/src ln -sf $TMP/$SRCNAM-$VERSION build/src/github.com/docker/docker diff --git a/system/docker/docker.info b/system/docker/docker.info index d783c8fc8199..6e677ce5cfb0 100644 --- a/system/docker/docker.info +++ b/system/docker/docker.info @@ -1,10 +1,10 @@ PRGNAM="docker" -VERSION="20.10.21" +VERSION="20.10.22" HOMEPAGE="https://www.docker.com/products/container-runtime" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/moby/moby/archive/v20.10.21/moby-20.10.21.tar.gz" -MD5SUM_x86_64="60830ade43c0eef9905cb97f246040cc" +DOWNLOAD_x86_64="https://github.com/moby/moby/archive/v20.10.22/moby-20.10.22.tar.gz" +MD5SUM_x86_64="4cb6d189768de032d395ec4c71b96694" REQUIRES="containerd docker-proxy tini" MAINTAINER="Audrius Kažukauskas" EMAIL="audrius@neutrino.lt" |