jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-06 01:17:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

update docker

Browse Source
This commit is contained in:
Chuck Moyes 2019-09-02 21:46:38 -07:00 committed by 5schatten
parent 128937b6de
commit c438a2bfd3
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/addons/service/docker/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="docker" PKG_NAME="docker"
PKG_VERSION="18.09.8" PKG_VERSION="19.03.1"
PKG_SHA256="33dfaf3cf296f8e9011ec6ed2de0125dfeaf8a938126f0218b0218a156c14014" PKG_SHA256="dad9123e203751ce9981bc34773721593655231c32412e310e748b18f10f0053"
PKG_REV="127" PKG_REV="127"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="ASL" PKG_LICENSE="ASL"

23
packages/addons/service/docker/patches/docker-100.01-use-addon-storage-location.patch
View File

@ -47,27 +47,18 @@ index 832fdb95a4..606ddfaf96 100644
// If registry is insecure and HTTPS failed, fallback to HTTP. // 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 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 --- a/components/engine/cmd/dockerd/daemon_unix.go
+++ b/components/engine/cmd/dockerd/daemon_unix.go +++ b/components/engine/cmd/dockerd/daemon_unix.go
@@ -19,7 +19,7 @@ import ( @@ -26,7 +26,7 @@ import (
"golang.org/x/sys/unix"
)
-const defaultDaemonConfigFile = "/etc/docker/daemon.json" func getDefaultDaemonConfigDir() (string, error) {
+const defaultDaemonConfigFile = "/storage/.kodi/userdata/addon_data/service.system.docker/config/daemon.json" if !honorXDG {
- return "/etc/docker", nil
// setDefaultUmask sets the umask to 0022 to avoid problems + return "/storage/.kodi/userdata/addon_data/service.system.docker/config", nil
// caused by custom umask
@@ -34,7 +34,7 @@ func setDefaultUmask() error {
} }
// NOTE: CLI uses ~/.docker while the daemon uses ~/.config/docker, because
func getDaemonConfDir(_ string) string {
- return "/etc/docker"
+ return "/storage/.kodi/userdata/addon_data/service.system.docker/config"
}
func (cli *DaemonCli) getPlatformContainerdDaemonOpts() ([]supervisor.DaemonOpt, error) {
diff --git a/components/engine/daemon/config/config_test.go b/components/engine/daemon/config/config_test.go diff --git a/components/engine/daemon/config/config_test.go b/components/engine/daemon/config/config_test.go
index 6998ed3312..c255b62146 100644 index 6998ed3312..c255b62146 100644
--- a/components/engine/daemon/config/config_test.go --- a/components/engine/daemon/config/config_test.go