docker: updated to 18.09.7 / updated Kodi addon storage location patch

packages/addons/service/docker/changelog.txt

@@ -1,3 +1,6 @@
+126
+- Update to docker 18.09.7
+
 125
 - Update to docker 18.09.5
 

packages/addons/service/docker/package.mk

@@ -3,9 +3,9 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="docker"
-PKG_VERSION="18.09.5"
-PKG_SHA256="57f2a5d3374d86a8eb680c91df4351f5cb648351b9b32520c6fd2d66e7e97fd5"
-PKG_REV="125"
+PKG_VERSION="18.09.7"
+PKG_SHA256="f05dc15f5c11635472534c3aaf759c39c1bba842dd1ac23059431c2fd1ae1795"
+PKG_REV="126"
 PKG_ARCH="any"
 PKG_LICENSE="ASL"
 PKG_SITE="http://www.docker.com/"

packages/addons/service/docker/patches/docker-001-use-addon-storage-location.patch

@@ -1,8 +1,25 @@
-From 9979cbaa4d0108da552fd452294788a042766995 Mon Sep 17 00:00:00 2001
+From de25daa9281709a90e4dc23b4c27cbcdcef32fd3 Mon Sep 17 00:00:00 2001
 From: 5schatten <supervisedthinking@gmail.com>
-Date: Wed, 7 Nov 2018 12:22:23 +0100
+Date: Sat, 29 Jun 2019 17:58:09 +0200
 Subject: [PATCH] use Kodi addon storage location
 
+---
+ .../github.com/docker/docker/registry/config_unix.go |  2 +-
+ .../github.com/docker/docker/registry/endpoint_v1.go |  2 +-
+ components/engine/cmd/dockerd/daemon_unix.go         |  4 ++--
+ components/engine/daemon/config/config_test.go       |  2 +-
+ .../engine/integration-cli/docker_cli_daemon_test.go | 12 ++++++------
+ .../docker_cli_external_volume_driver_unix_test.go   |  8 ++++----
+ .../integration-cli/docker_cli_network_unix_test.go  |  8 ++++----
+ .../engine/integration-cli/docker_cli_swarm_test.go  |  8 ++++----
+ .../integration/plugin/authz/authz_plugin_test.go    |  6 +++---
+ .../integration/plugin/graphdriver/external_test.go  |  6 +++---
+ components/engine/pkg/plugins/discovery_unix.go      |  2 +-
+ components/engine/pkg/plugins/plugins.go             |  2 +-
+ components/engine/registry/config_unix.go            |  2 +-
+ components/engine/registry/endpoint_v1.go            |  2 +-
+ 14 files changed, 33 insertions(+), 33 deletions(-)
+
 diff --git a/components/cli/vendor/github.com/docker/docker/registry/config_unix.go b/components/cli/vendor/github.com/docker/docker/registry/config_unix.go
 index 20fb47bcae..a023df7895 100644
 --- a/components/cli/vendor/github.com/docker/docker/registry/config_unix.go
@@ -65,7 +82,7 @@ index 6998ed3312..c255b62146 100644
  	flags.String("config-file", configFile, "")
  	err := Reload(configFile, flags, func(c *Config) {
 diff --git a/components/engine/integration-cli/docker_cli_daemon_test.go b/components/engine/integration-cli/docker_cli_daemon_test.go
-index 986cc27530..7a0c2805cd 100644
+index d3cd5f1676..b5e504489d 100644
 --- a/components/engine/integration-cli/docker_cli_daemon_test.go
 +++ b/components/engine/integration-cli/docker_cli_daemon_test.go
 @@ -546,11 +546,11 @@ func (s *DockerDaemonSuite) TestDaemonAllocatesListeningPort(c *check.C) {
@@ -121,11 +138,11 @@ index da8bb7e011..605a162e79 100644
  
 -	err := os.MkdirAll("/etc/docker/plugins", 0755)
 +	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
- 	c.Assert(err, checker.IsNil)
+ 	assert.NilError(c, err)
  
 -	err = ioutil.WriteFile("/etc/docker/plugins/"+name+".spec", []byte(s.Server.URL), 0644)
 +	err = ioutil.WriteFile("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/"+name+".spec", []byte(s.Server.URL), 0644)
- 	c.Assert(err, checker.IsNil)
+ 	assert.NilError(c, err)
  	return s
  }
 @@ -278,7 +278,7 @@ func newVolumePlugin(c *check.C, name string) *volumePlugin {
@@ -134,7 +151,7 @@ index da8bb7e011..605a162e79 100644
  
 -	err := os.RemoveAll("/etc/docker/plugins")
 +	err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins")
- 	c.Assert(err, checker.IsNil)
+ 	assert.NilError(c, err)
  }
  
 @@ -371,7 +371,7 @@ func hostVolumePath(name string) string {
@@ -156,17 +173,17 @@ index d3d6256a75..a0f0ae973d 100644
  
 -	err := os.MkdirAll("/etc/docker/plugins", 0755)
 +	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
- 	c.Assert(err, checker.IsNil)
+ 	assert.NilError(c, err)
  
 -	fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", netDrv)
 +	fileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", netDrv)
  	err = ioutil.WriteFile(fileName, []byte(url), 0644)
- 	c.Assert(err, checker.IsNil)
+ 	assert.NilError(c, err)
  
 -	ipamFileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", ipamDrv)
 +	ipamFileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", ipamDrv)
  	err = ioutil.WriteFile(ipamFileName, []byte(url), 0644)
- 	c.Assert(err, checker.IsNil)
+ 	assert.NilError(c, err)
  }
 @@ -227,7 +227,7 @@ func (s *DockerNetworkSuite) TearDownSuite(c *check.C) {
  
@@ -174,11 +191,11 @@ index d3d6256a75..a0f0ae973d 100644
  
 -	err := os.RemoveAll("/etc/docker/plugins")
 +	err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins")
- 	c.Assert(err, checker.IsNil)
+ 	assert.NilError(c, err)
  }
  
 diff --git a/components/engine/integration-cli/docker_cli_swarm_test.go b/components/engine/integration-cli/docker_cli_swarm_test.go
-index 9f99d0c849..2d9a4b088e 100644
+index f6fadcf995..5d0b5256c1 100644
 --- a/components/engine/integration-cli/docker_cli_swarm_test.go
 +++ b/components/engine/integration-cli/docker_cli_swarm_test.go
 @@ -783,14 +783,14 @@ func setupRemoteGlobalNetworkPlugin(c *check.C, mux *http.ServeMux, url, netDrv,
@@ -187,17 +204,17 @@ index 9f99d0c849..2d9a4b088e 100644
  
 -	err := os.MkdirAll("/etc/docker/plugins", 0755)
 +	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
- 	c.Assert(err, checker.IsNil)
+ 	assert.NilError(c, err)
  
 -	fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", netDrv)
 +	fileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", netDrv)
  	err = ioutil.WriteFile(fileName, []byte(url), 0644)
- 	c.Assert(err, checker.IsNil)
+ 	assert.NilError(c, err)
  
 -	ipamFileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", ipamDrv)
 +	ipamFileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", ipamDrv)
  	err = ioutil.WriteFile(ipamFileName, []byte(url), 0644)
- 	c.Assert(err, checker.IsNil)
+ 	assert.NilError(c, err)
  }
 @@ -802,7 +802,7 @@ func (s *DockerSwarmSuite) TestSwarmNetworkPlugin(c *check.C) {
  	setupRemoteGlobalNetworkPlugin(c, mux, s.server.URL, globalNetworkPlugin, globalIPAMPlugin)
@@ -205,11 +222,11 @@ index 9f99d0c849..2d9a4b088e 100644
  		s.server.Close()
 -		err := os.RemoveAll("/etc/docker/plugins")
 +		err := os.RemoveAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins")
- 		c.Assert(err, checker.IsNil)
+ 		assert.NilError(c, err)
  	}()
  
 diff --git a/components/engine/integration/plugin/authz/authz_plugin_test.go b/components/engine/integration/plugin/authz/authz_plugin_test.go
-index d0f5d8a783..ba626c6310 100644
+index 105affc1af..fa631a377a 100644
 --- a/components/engine/integration/plugin/authz/authz_plugin_test.go
 +++ b/components/engine/integration/plugin/authz/authz_plugin_test.go
 @@ -55,15 +55,15 @@ func setupTestV1(t *testing.T) func() {
@@ -268,7 +285,7 @@ index 58058f2828..a7b449ca25 100644
 -var specsPaths = []string{"/etc/docker/plugins", "/usr/lib/docker/plugins"}
 +var specsPaths = []string{"/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", "/usr/lib/docker/plugins"}
 diff --git a/components/engine/pkg/plugins/plugins.go b/components/engine/pkg/plugins/plugins.go
-index 28c06ff693..c24cad2b63 100644
+index 6962079df9..77b69265b1 100644
 --- a/components/engine/pkg/plugins/plugins.go
 +++ b/components/engine/pkg/plugins/plugins.go
 @@ -4,7 +4,7 @@