From cc488eda530226910c85ea273e28332292c57a25 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 17 Dec 2022 20:35:26 +0000 Subject: [PATCH 1/4] moby: update to 23.0.0-beta.1 release notes: - https://github.com/moby/moby/releases/tag/v23.0.0-beta.1 --- packages/addons/addon-depends/docker/moby/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/docker/moby/package.mk b/packages/addons/addon-depends/docker/moby/package.mk index 66d037c749..50e6df98bd 100644 --- a/packages/addons/addon-depends/docker/moby/package.mk +++ b/packages/addons/addon-depends/docker/moby/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) PKG_NAME="moby" -PKG_VERSION="22.06.0-beta.0" -PKG_SHA256="d0221f0b1c0eda2629ed8b7f08b4ec86e61cf38e0cf699f5bd01a2b662273b87" +PKG_VERSION="23.0.0-beta.1" +PKG_SHA256="cae782316ce3e699912260ac117c5b279496009a6ede761fd0418fa9d2b5b8a5" PKG_LICENSE="ASL" PKG_SITE="https://mobyproject.org/" PKG_URL="https://github.com/moby/moby/archive/v${PKG_VERSION}.tar.gz" From 90a89e64b4aab8fa83173fb86a98ce48d18a7784 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 17 Dec 2022 20:41:53 +0000 Subject: [PATCH 2/4] cli: update to 23.0.0-beta.1 --- packages/addons/addon-depends/docker/cli/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/docker/cli/package.mk b/packages/addons/addon-depends/docker/cli/package.mk index 65c134b0a0..b1f40a24d3 100644 --- a/packages/addons/addon-depends/docker/cli/package.mk +++ b/packages/addons/addon-depends/docker/cli/package.mk @@ -3,7 +3,7 @@ PKG_NAME="cli" PKG_VERSION="$(get_pkg_version moby)" -PKG_SHA256="2f5949173515b70daa0b78fea7185ffd219ca31f7381a0e1218eeefc7f70199c" +PKG_SHA256="a51348d961d959473c701dcfd291bda8b78a9652ec7692f517b44858a5593da2" PKG_LICENSE="ASL" PKG_SITE="https://github.com/docker/cli" PKG_URL="https://github.com/docker/cli/archive/v${PKG_VERSION}.tar.gz" @@ -12,7 +12,7 @@ PKG_LONGDESC="The Docker CLI" PKG_TOOLCHAIN="manual" # Git commit of the matching release https://github.com/docker/cli/releases -export PKG_GIT_COMMIT="3e9117b7e241439e314eaf6fe944b4019fbaa941" +export PKG_GIT_COMMIT="65d3f7830d8f73aeabe649ca17386f5ae5655210" configure_target() { go_configure From 73751156bf6a35c76585929d1ed43cc9e48fa56b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 17 Dec 2022 20:49:59 +0000 Subject: [PATCH 3/4] docker: update to 23.0.0-beta.1 and addon (2) - cli: update to 23.0.0-beta.1 - moby: update to 23.0.0-beta.1 release notes: - https://github.com/moby/moby/releases/tag/v23.0.0-beta.1 --- packages/addons/service/docker/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index ecb0a0dea2..cde23b95f9 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="docker" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="ASL" PKG_SITE="http://www.docker.com/" From 1f6cdc858943b6c811110c171d9e9a0a17b7607f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 18 Dec 2022 03:36:04 +0000 Subject: [PATCH 4/4] docker: update docker.conf Fix the following error: dockerd[2525]: Flag --graph has been deprecated, Use --data-root instead dockerd[2525]: the "graph" config file option is deprecated; use "data-root" instead systemd[1]: docker.service: Main process exited, code=exited, status=1/FAILURE Fix the following warning: [graphdriver] trying configured driver: overlay2 DEPRECATED: the overlay2.override_kernel_check option is ignored and will be removed in the next release. You can safely remove this option from your configuration. --- packages/addons/service/docker/source/bin/docker-config | 5 +++++ packages/addons/service/docker/source/config/docker.conf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/docker/source/bin/docker-config b/packages/addons/service/docker/source/bin/docker-config index d3775a7388..1b1d133d29 100755 --- a/packages/addons/service/docker/source/bin/docker-config +++ b/packages/addons/service/docker/source/bin/docker-config @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) +# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) ADDON_DIR="/storage/.kodi/addons/service.system.docker" ADDON_HOME_DIR="/storage/.kodi/userdata/addon_data/service.system.docker" @@ -12,6 +13,10 @@ fi if [ ! -f "$ADDON_HOME_DIR/config/docker.conf" ]; then cp $ADDON_DIR/config/docker.conf $ADDON_HOME_DIR/config/docker.conf +else + # previous deprecated options before v23.0.0 need to be updated + sed -i -e 's/--storage-opt overlay2.override_kernel_check=1//' \ + -e 's/--graph=/--data-root=/' $ADDON_HOME_DIR/config/docker.conf fi if [ ! -d "$ADDON_HOME_DIR/docker" ]; then diff --git a/packages/addons/service/docker/source/config/docker.conf b/packages/addons/service/docker/source/config/docker.conf index 1153af8d14..7221dbcd87 100644 --- a/packages/addons/service/docker/source/config/docker.conf +++ b/packages/addons/service/docker/source/config/docker.conf @@ -1,2 +1,2 @@ DOCKER_DAEMON_OPTS="--data-root=/storage/.kodi/userdata/addon_data/service.system.docker/docker" -DOCKER_STORAGE_OPTS="--storage-driver=overlay2 --storage-opt overlay2.override_kernel_check=1" +DOCKER_STORAGE_OPTS="--storage-driver=overlay2"