From c438a2bfd38ed7136f7a0c808fe6fdfff600d23b Mon Sep 17 00:00:00 2001 From: Chuck Moyes Date: Mon, 2 Sep 2019 21:46:38 -0700 Subject: [PATCH] update docker --- packages/addons/service/docker/package.mk | 4 +-- ...er-100.01-use-addon-storage-location.patch | 27 +++++++------------ 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index 278e5cafb5..a291e98354 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="docker" -PKG_VERSION="18.09.8" -PKG_SHA256="33dfaf3cf296f8e9011ec6ed2de0125dfeaf8a938126f0218b0218a156c14014" +PKG_VERSION="19.03.1" +PKG_SHA256="dad9123e203751ce9981bc34773721593655231c32412e310e748b18f10f0053" PKG_REV="127" PKG_ARCH="any" PKG_LICENSE="ASL" diff --git a/packages/addons/service/docker/patches/docker-100.01-use-addon-storage-location.patch b/packages/addons/service/docker/patches/docker-100.01-use-addon-storage-location.patch index 782eca21c5..059fc8606b 100644 --- a/packages/addons/service/docker/patches/docker-100.01-use-addon-storage-location.patch +++ b/packages/addons/service/docker/patches/docker-100.01-use-addon-storage-location.patch @@ -47,27 +47,18 @@ index 832fdb95a4..606ddfaf96 100644 // If registry is insecure and HTTPS failed, fallback to HTTP. diff --git a/components/engine/cmd/dockerd/daemon_unix.go b/components/engine/cmd/dockerd/daemon_unix.go -index 7b03e28594..74fc0cfe24 100644 +index a6685bb..f39da58 100644 --- a/components/engine/cmd/dockerd/daemon_unix.go +++ b/components/engine/cmd/dockerd/daemon_unix.go -@@ -19,7 +19,7 @@ import ( - "golang.org/x/sys/unix" - ) +@@ -26,7 +26,7 @@ import ( --const defaultDaemonConfigFile = "/etc/docker/daemon.json" -+const defaultDaemonConfigFile = "/storage/.kodi/userdata/addon_data/service.system.docker/config/daemon.json" - - // setDefaultUmask sets the umask to 0022 to avoid problems - // caused by custom umask -@@ -34,7 +34,7 @@ func setDefaultUmask() error { - } - - func getDaemonConfDir(_ string) string { -- return "/etc/docker" -+ return "/storage/.kodi/userdata/addon_data/service.system.docker/config" - } - - func (cli *DaemonCli) getPlatformContainerdDaemonOpts() ([]supervisor.DaemonOpt, error) { + func getDefaultDaemonConfigDir() (string, error) { + if !honorXDG { +- return "/etc/docker", nil ++ return "/storage/.kodi/userdata/addon_data/service.system.docker/config", nil + } + // NOTE: CLI uses ~/.docker while the daemon uses ~/.config/docker, because + diff --git a/components/engine/daemon/config/config_test.go b/components/engine/daemon/config/config_test.go index 6998ed3312..c255b62146 100644 --- a/components/engine/daemon/config/config_test.go