Merge pull request #280 from lrusak/docker

docker: update to 1.11.1

packages/addons/service/docker/changelog.txt

@@ -1,5 +1,8 @@
+8.0.102
+- Update to docker 1.11.1
+
 8.0.101
-- Update to golan 1.6.2
+- Update to golang 1.6.2
 - Update to docker 1.11.0
 
 8.0.100

packages/addons/service/docker/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="docker"
-PKG_VERSION="1.11.0"
+PKG_VERSION="1.11.1"
-PKG_REV="101"
+PKG_REV="102"
 PKG_ARCH="any"
 PKG_ADDON_PROJECTS="Generic RPi RPi2"
 PKG_LICENSE="ASL"
@@ -38,6 +38,7 @@ PKG_ADDON_REPOVERSION="8.0"
 
 configure_target() {
   export DOCKER_BUILDTAGS="daemon \
+                           autogen \
                            exclude_graphdriver_devicemapper \
                            exclude_graphdriver_aufs \
                            exclude_graphdriver_btrfs"

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

@@ -2,8 +2,8 @@
 # find . -name "*.go" -print | xargs sed -i 's/\/etc\/docker/\/storage\/.kodi\/userdata\/addon_data\/service.system.docker\/config/g'
 
 diff -Naur a/docker/daemon_unix.go b/docker/daemon_unix.go
---- a/docker/daemon_unix.go	2016-04-13 11:03:42.000000000 -0700
+--- a/docker/daemon_unix.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/docker/daemon_unix.go	2016-04-21 02:39:35.588218701 -0700
++++ b/docker/daemon_unix.go	2016-05-02 12:19:20.461479163 -0700
 @@ -16,7 +16,7 @@
  	"github.com/docker/docker/pkg/system"
  )
@@ -23,8 +23,8 @@ diff -Naur a/docker/daemon_unix.go b/docker/daemon_unix.go
  
  // setupConfigReloadTrap configures the USR2 signal to reload the configuration.
 diff -Naur a/integration-cli/docker_cli_authz_unix_test.go b/integration-cli/docker_cli_authz_unix_test.go
---- a/integration-cli/docker_cli_authz_unix_test.go	2016-04-13 11:03:42.000000000 -0700
+--- a/integration-cli/docker_cli_authz_unix_test.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/integration-cli/docker_cli_authz_unix_test.go	2016-04-21 02:39:35.417217012 -0700
++++ b/integration-cli/docker_cli_authz_unix_test.go	2016-05-02 12:19:20.291477565 -0700
 @@ -134,10 +134,10 @@
  		w.Write(b)
  	})
@@ -48,9 +48,9 @@ diff -Naur a/integration-cli/docker_cli_authz_unix_test.go b/integration-cli/doc
  }
  
 diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go
---- a/integration-cli/docker_cli_daemon_test.go	2016-04-13 11:03:42.000000000 -0700
+--- a/integration-cli/docker_cli_daemon_test.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/integration-cli/docker_cli_daemon_test.go	2016-04-21 02:39:35.482217654 -0700
++++ b/integration-cli/docker_cli_daemon_test.go	2016-05-02 12:19:20.356478174 -0700
-@@ -511,13 +511,13 @@
+@@ -512,13 +512,13 @@
  
  func (s *DockerDaemonSuite) TestDaemonKeyGeneration(c *check.C) {
  	// TODO: skip or update for Windows daemon
@@ -66,7 +66,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err != nil {
  		c.Fatalf("Error opening key file")
  	}
-@@ -530,7 +530,7 @@
+@@ -531,7 +531,7 @@
  
  func (s *DockerDaemonSuite) TestDaemonKeyMigration(c *check.C) {
  	// TODO: skip or update for Windows daemon
@@ -75,7 +75,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	k1, err := libtrust.GenerateECP256PrivateKey()
  	if err != nil {
  		c.Fatalf("Error generating private key: %s", err)
-@@ -547,7 +547,7 @@
+@@ -548,7 +548,7 @@
  	}
  	s.d.Stop()
  
@@ -84,7 +84,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err != nil {
  		c.Fatalf("Error opening key file")
  	}
-@@ -1295,7 +1295,7 @@
+@@ -1296,7 +1296,7 @@
  		Y   string `json:"y"`
  	}
  
@@ -93,7 +93,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err := s.d.Start(); err != nil {
  		c.Fatalf("Failed to start daemon: %v", err)
  	}
-@@ -1305,7 +1305,7 @@
+@@ -1306,7 +1306,7 @@
  	}
  
  	config := &Config{}
@@ -102,7 +102,7 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err != nil {
  		c.Fatalf("Error reading key.json file: %s", err)
  	}
-@@ -1325,11 +1325,11 @@
+@@ -1326,11 +1326,11 @@
  	}
  
  	// write back
@@ -117,9 +117,9 @@ diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_
  	if err := s.d.Start(); err == nil {
  		c.Fatalf("It should not be successful to start daemon with wrong key: %v", err)
 diff -Naur a/integration-cli/docker_cli_external_graphdriver_unix_test.go b/integration-cli/docker_cli_external_graphdriver_unix_test.go
---- a/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-04-13 11:03:42.000000000 -0700
+--- a/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-04-21 02:39:35.509217920 -0700
++++ b/integration-cli/docker_cli_external_graphdriver_unix_test.go	2016-05-02 12:19:20.382478419 -0700
-@@ -283,18 +283,18 @@
+@@ -306,10 +306,10 @@
  		respond(w, &graphDriverResponse{Size: size})
  	})
  
@@ -128,14 +128,14 @@ diff -Naur a/integration-cli/docker_cli_external_graphdriver_unix_test.go b/inte
 +	err = os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0755)
 +	c.Assert(err, check.IsNil, check.Commentf("error creating /storage/.kodi/userdata/addon_data/service.system.docker/config/plugins"))
  
--	err = ioutil.WriteFile("/etc/docker/plugins/test-external-graph-driver.spec", []byte(s.server.URL), 0644)
+-	specFile := "/etc/docker/plugins/" + name + "." + ext
--	c.Assert(err, check.IsNil, check.Commentf("error writing to /etc/docker/plugins/test-external-graph-driver.spec"))
++	specFile := "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/" + name + "." + ext
-+	err = ioutil.WriteFile("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/test-external-graph-driver.spec", []byte(s.server.URL), 0644)
+ 	err = ioutil.WriteFile(specFile, b, 0644)
-+	c.Assert(err, check.IsNil, check.Commentf("error writing to /storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/test-external-graph-driver.spec"))
+ 	c.Assert(err, check.IsNil, check.Commentf("error writing to %s", specFile))
  }
- 
+@@ -318,8 +318,8 @@
- func (s *DockerExternalGraphdriverSuite) TearDownSuite(c *check.C) {
  	s.server.Close()
+ 	s.jserver.Close()
  
 -	err := os.RemoveAll("/etc/docker/plugins")
 -	c.Assert(err, check.IsNil, check.Commentf("error removing /etc/docker/plugins"))
@@ -145,8 +145,8 @@ diff -Naur a/integration-cli/docker_cli_external_graphdriver_unix_test.go b/inte
  
  func (s *DockerExternalGraphdriverSuite) TestExternalGraphDriver(c *check.C) {
 diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go
---- a/integration-cli/docker_cli_network_unix_test.go	2016-04-13 11:03:42.000000000 -0700
+--- a/integration-cli/docker_cli_network_unix_test.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/integration-cli/docker_cli_network_unix_test.go	2016-04-21 02:39:35.506217891 -0700
++++ b/integration-cli/docker_cli_network_unix_test.go	2016-05-02 12:19:20.380478400 -0700
 @@ -200,14 +200,14 @@
  		}
  	})
@@ -175,8 +175,8 @@ diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/d
  }
  
 diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integration-cli/docker_cli_start_volume_driver_unix_test.go
---- a/integration-cli/docker_cli_start_volume_driver_unix_test.go	2016-04-13 11:03:42.000000000 -0700
+--- a/integration-cli/docker_cli_start_volume_driver_unix_test.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/integration-cli/docker_cli_start_volume_driver_unix_test.go	2016-04-21 02:39:35.514217970 -0700
++++ b/integration-cli/docker_cli_start_volume_driver_unix_test.go	2016-05-02 12:19:20.387478466 -0700
 @@ -216,17 +216,17 @@
  		send(w, nil)
  	})
@@ -217,9 +217,9 @@ diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integ
  	defer os.RemoveAll(specPath)
  
 diff -Naur a/pkg/plugins/discovery.go b/pkg/plugins/discovery.go
---- a/pkg/plugins/discovery.go	2016-04-13 11:03:42.000000000 -0700
+--- a/pkg/plugins/discovery.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/pkg/plugins/discovery.go	2016-04-21 02:39:35.668219491 -0700
++++ b/pkg/plugins/discovery.go	2016-05-02 12:19:20.540479907 -0700
-@@ -15,7 +15,7 @@
+@@ -16,7 +16,7 @@
  	// ErrNotFound plugin not found
  	ErrNotFound = errors.New("plugin not found")
  	socketsPath = "/run/docker/plugins"
@@ -229,8 +229,8 @@ diff -Naur a/pkg/plugins/discovery.go b/pkg/plugins/discovery.go
  
  // localRegistry defines a registry that is local (using unix socket).
 diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
---- a/pkg/plugins/plugins.go	2016-04-13 11:03:42.000000000 -0700
+--- a/pkg/plugins/plugins.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/pkg/plugins/plugins.go	2016-04-21 02:39:35.667219481 -0700
++++ b/pkg/plugins/plugins.go	2016-05-02 12:19:20.539479898 -0700
 @@ -4,7 +4,7 @@
  // Docker discovers plugins by looking for them in the plugin directory whenever
  // a user or container tries to use one by name. UNIX domain socket files must
@@ -241,8 +241,8 @@ diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
  // its name if it exists.
  //
 diff -Naur a/registry/config_unix.go b/registry/config_unix.go
---- a/registry/config_unix.go	2016-04-13 11:03:42.000000000 -0700
+--- a/registry/config_unix.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/registry/config_unix.go	2016-04-21 02:39:35.629219106 -0700
++++ b/registry/config_unix.go	2016-05-02 12:19:20.502479549 -0700
 @@ -4,7 +4,7 @@
  
  var (
@@ -253,8 +253,8 @@ diff -Naur a/registry/config_unix.go b/registry/config_unix.go
  
  // cleanPath is used to ensure that a directory name is valid on the target
 diff -Naur a/registry/endpoint_v1.go b/registry/endpoint_v1.go
---- a/registry/endpoint_v1.go	2016-04-13 11:03:42.000000000 -0700
+--- a/registry/endpoint_v1.go	2016-04-25 20:35:31.000000000 -0700
-+++ b/registry/endpoint_v1.go	2016-04-21 02:39:35.629219106 -0700
++++ b/registry/endpoint_v1.go	2016-05-02 12:19:20.501479540 -0700
 @@ -49,7 +49,7 @@
  		if endpoint.IsSecure {
  			// If registry is secure and HTTPS failed, show user the error and tell them about `--insecure-registry`