jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #193 from lrusak/docker

Browse Source 
docker: update to 1.11.0
This commit is contained in:
Christian Hewitt 2016-04-21 16:20:38 +04:00
commit 528f879355
4 changed files with 47 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/addons/addon-depends/go/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="go"
PKG_VERSION="1.6"
PKG_VERSION="1.6.2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"

4
packages/addons/service/docker/changelog.txt
View File

@ -1,3 +1,7 @@
8.0.101
- Update to golan 1.6.2
- Update to docker 1.11.0
8.0.100
- Update for LibreELEC 8.0

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

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="docker"
PKG_VERSION="1.10.3"
PKG_REV="100"
PKG_VERSION="1.11.0"
PKG_REV="101"
PKG_ARCH="any"
PKG_ADDON_PROJECTS="Generic RPi RPi2"
PKG_LICENSE="ASL"

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

@ -2,18 +2,18 @@
# 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-02-11 19:45:56.000000000 +0100
+++ b/docker/daemon_unix.go 2016-02-19 00:28:50.662085695 +0100
--- a/docker/daemon_unix.go 2016-04-13 11:03:42.000000000 -0700
+++ b/docker/daemon_unix.go 2016-04-21 02:39:35.588218701 -0700
@@ -16,7 +16,7 @@
_ "github.com/docker/docker/daemon/execdriver/native"
"github.com/docker/docker/pkg/system"
)
-const defaultDaemonConfigFile = "/etc/docker/daemon.json"
+const defaultDaemonConfigFile = "/storage/.kodi/userdata/addon_data/service.system.docker/config/daemon.json"
func setPlatformServerConfig(serverConfig *apiserver.Config, daemonCfg *daemon.Config) *apiserver.Config {
serverConfig.SocketGroup = daemonCfg.SocketGroup
@@ -50,7 +50,7 @@
serverConfig.EnableCors = daemonCfg.EnableCors
@@ -49,7 +49,7 @@
}
func getDaemonConfDir() string {
@ -23,10 +23,10 @@ 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-02-11 19:45:56.000000000 +0100
+++ b/integration-cli/docker_cli_authz_unix_test.go 2016-02-19 00:28:50.642085661 +0100
@@ -121,10 +121,10 @@
}
--- a/integration-cli/docker_cli_authz_unix_test.go 2016-04-13 11:03:42.000000000 -0700
+++ b/integration-cli/docker_cli_authz_unix_test.go 2016-04-21 02:39:35.417217012 -0700
@@ -134,10 +134,10 @@
w.Write(b)
})
- err := os.MkdirAll("/etc/docker/plugins", 0755)
@ -38,7 +38,7 @@ diff -Naur a/integration-cli/docker_cli_authz_unix_test.go b/integration-cli/doc
err = ioutil.WriteFile(fileName, []byte(s.server.URL), 0644)
c.Assert(err, checker.IsNil)
}
@@ -163,7 +163,7 @@
@@ -186,7 +186,7 @@
s.server.Close()
@ -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-02-11 19:45:56.000000000 +0100
+++ b/integration-cli/docker_cli_daemon_test.go 2016-02-19 00:28:50.636085651 +0100
@@ -537,13 +537,13 @@
--- a/integration-cli/docker_cli_daemon_test.go 2016-04-13 11:03:42.000000000 -0700
+++ b/integration-cli/docker_cli_daemon_test.go 2016-04-21 02:39:35.482217654 -0700
@@ -511,13 +511,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")
}
@@ -556,7 +556,7 @@
@@ -530,7 +530,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)
@@ -573,7 +573,7 @@
@@ -547,7 +547,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")
}
@@ -1337,7 +1337,7 @@
@@ -1295,7 +1295,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)
}
@@ -1347,7 +1347,7 @@
@@ -1305,7 +1305,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)
}
@@ -1367,11 +1367,11 @@
@@ -1325,11 +1325,11 @@
}
// write back
@ -117,8 +117,8 @@ 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-02-11 19:45:56.000000000 +0100
+++ b/integration-cli/docker_cli_external_graphdriver_unix_test.go 2016-02-19 00:28:50.632085644 +0100
--- a/integration-cli/docker_cli_external_graphdriver_unix_test.go 2016-04-13 11:03:42.000000000 -0700
+++ b/integration-cli/docker_cli_external_graphdriver_unix_test.go 2016-04-21 02:39:35.509217920 -0700
@@ -283,18 +283,18 @@
respond(w, &graphDriverResponse{Size: size})
})
@ -145,9 +145,9 @@ 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-02-11 19:45:56.000000000 +0100
+++ b/integration-cli/docker_cli_network_unix_test.go 2016-02-19 00:28:50.629085639 +0100
@@ -201,14 +201,14 @@
--- a/integration-cli/docker_cli_network_unix_test.go 2016-04-13 11:03:42.000000000 -0700
+++ b/integration-cli/docker_cli_network_unix_test.go 2016-04-21 02:39:35.506217891 -0700
@@ -200,14 +200,14 @@
}
})
@ -165,7 +165,7 @@ diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/d
err = ioutil.WriteFile(ipamFileName, []byte(url), 0644)
c.Assert(err, checker.IsNil)
}
@@ -220,7 +220,7 @@
@@ -219,7 +219,7 @@
s.server.Close()
@ -175,9 +175,9 @@ 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-02-11 19:45:56.000000000 +0100
+++ b/integration-cli/docker_cli_start_volume_driver_unix_test.go 2016-02-19 00:28:50.651085676 +0100
@@ -206,17 +206,17 @@
--- a/integration-cli/docker_cli_start_volume_driver_unix_test.go 2016-04-13 11:03:42.000000000 -0700
+++ b/integration-cli/docker_cli_start_volume_driver_unix_test.go 2016-04-21 02:39:35.514217970 -0700
@@ -216,17 +216,17 @@
send(w, nil)
})
@ -198,7 +198,7 @@ diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integ
c.Assert(err, checker.IsNil)
}
@@ -301,7 +301,7 @@
@@ -311,7 +311,7 @@
// Make sure a request to use a down driver doesn't block other requests
func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverLookupNotBlocked(c *check.C) {
@ -207,7 +207,7 @@ diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integ
err := ioutil.WriteFile(specPath, []byte("tcp://127.0.0.7:9999"), 0644)
c.Assert(err, check.IsNil)
defer os.RemoveAll(specPath)
@@ -340,7 +340,7 @@
@@ -350,7 +350,7 @@
err := s.d.StartWithBusybox()
c.Assert(err, checker.IsNil)
@ -216,33 +216,9 @@ diff -Naur a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integ
os.RemoveAll(specPath)
defer os.RemoveAll(specPath)
diff -Naur a/integration-cli/docker_cli_volume_driver_compat_unix_test.go b/integration-cli/docker_cli_volume_driver_compat_unix_test.go
--- a/integration-cli/docker_cli_volume_driver_compat_unix_test.go 2016-02-11 19:45:56.000000000 +0100
+++ b/integration-cli/docker_cli_volume_driver_compat_unix_test.go 2016-02-19 00:28:50.646085667 +0100
@@ -173,17 +173,17 @@
send(w, nil)
})
- 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)
- err = ioutil.WriteFile("/etc/docker/plugins/test-external-volume-driver.spec", []byte(s.server.URL), 0644)
+ err = ioutil.WriteFile("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/test-external-volume-driver.spec", []byte(s.server.URL), 0644)
c.Assert(err, checker.IsNil)
}
func (s *DockerExternalVolumeSuiteCompatV1_1) TearDownSuite(c *check.C) {
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)
}
diff -Naur a/pkg/plugins/discovery.go b/pkg/plugins/discovery.go
--- a/pkg/plugins/discovery.go 2016-02-11 19:45:56.000000000 +0100
+++ b/pkg/plugins/discovery.go 2016-02-19 00:28:50.247084996 +0100
--- a/pkg/plugins/discovery.go 2016-04-13 11:03:42.000000000 -0700
+++ b/pkg/plugins/discovery.go 2016-04-21 02:39:35.668219491 -0700
@@ -15,7 +15,7 @@
// ErrNotFound plugin not found
ErrNotFound = errors.New("plugin not found")
@ -253,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-02-11 19:45:56.000000000 +0100
+++ b/pkg/plugins/plugins.go 2016-02-19 00:28:50.263085023 +0100
--- a/pkg/plugins/plugins.go 2016-04-13 11:03:42.000000000 -0700
+++ b/pkg/plugins/plugins.go 2016-04-21 02:39:35.667219481 -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
@ -265,9 +241,9 @@ 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-02-11 19:45:56.000000000 +0100
+++ b/registry/config_unix.go 2016-02-19 00:28:50.742085829 +0100
@@ -12,7 +12,7 @@
--- a/registry/config_unix.go 2016-04-13 11:03:42.000000000 -0700
+++ b/registry/config_unix.go 2016-04-21 02:39:35.629219106 -0700
@@ -4,7 +4,7 @@
var (
// CertsDir is the directory where certificates are stored
@ -276,10 +252,10 @@ 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.go b/registry/endpoint.go
--- a/registry/endpoint.go 2016-02-11 19:45:56.000000000 +0100
+++ b/registry/endpoint.go 2016-02-19 00:28:50.740085826 +0100
@@ -73,7 +73,7 @@
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
+++ b/registry/endpoint_v1.go 2016-04-21 02:39:35.629219106 -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`
// in case that's what they need. DO NOT accept unknown CA certificates, and DO NOT fallback to HTTP.