Merge pull request #1308 from lrusak/docker-libreelec-8.0

backport of #1307 (docker: update to 1.13.1)

packages/addons/addon-depends/containerd/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="containerd"
-PKG_VERSION="03e5862"
+PKG_VERSION="aa8187d"
 PKG_ARCH="any"
 PKG_LICENSE="APL"
 PKG_SITE="https://containerd.tools/"

packages/addons/addon-depends/go/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="go"
-PKG_VERSION="1.7.4"
+PKG_VERSION="1.7.5"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="https://golang.org"

packages/addons/addon-depends/runc/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="runc"
-PKG_VERSION="2f7393a"
+PKG_VERSION="9df8b30"
 PKG_ARCH="any"
 PKG_LICENSE="APL"
 PKG_SITE="https://github.com/opencontainers/runc"

packages/addons/service/docker/changelog.txt

@@ -1,3 +1,7 @@
+8.1.113
+- Update to docker 1.13.1
+- Update to golang 1.7.5
+
 8.1.112
 - Update to docker 1.13.0
 - Use journald log driver

packages/addons/service/docker/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="docker"
-PKG_VERSION="1.13.0"
+PKG_VERSION="1.13.1"
-PKG_REV="112"
+PKG_REV="113"
 PKG_ARCH="any"
 PKG_ADDON_PROJECTS="Generic RPi RPi2 imx6 WeTek_Hub WeTek_Play_2 Odroid_C2"
 PKG_LICENSE="ASL"
@@ -73,7 +73,9 @@ configure_target() {
   export PATH=$PATH:$GOROOT/bin
 
   mkdir -p $ROOT/$PKG_BUILD/.gopath
-  mv $ROOT/$PKG_BUILD/vendor $ROOT/$PKG_BUILD/.gopath/src
+  if [ -d $ROOT/$PKG_BUILD/vendor ]; then
+    mv $ROOT/$PKG_BUILD/vendor $ROOT/$PKG_BUILD/.gopath/src
+  fi
   ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/.gopath/src/github.com/docker/docker
 
   # used for docker version

packages/addons/service/docker/patches/docker-002-PR29846.patch

@@ -1,60 +0,0 @@
-commit 472c4da2e78a01b4fcf194c2c85edde4fc32aa0b
-Author: Sebastiaan van Stijn <github@gone.nl>
-Date:   Tue Jan 3 14:54:30 2017 +0100
-
-    do not create init-dir if not needed
-    
-    commit 56f77d5ade945b3b8816a6c8acb328b7c6dce9a7
-    added support for cpu-rt-period and cpu-rt-runtime,
-    but always initialized the cgroup path, even if not
-    used.
-    
-    As a result, containers failed to start on a
-    read-only filesystem.
-    
-    This patch only creates the cgroup path if
-    one of these options is set.
-    
-    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
-
-diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go
-index 56e980d..5b3ffeb 100644
---- a/daemon/daemon_unix.go
-+++ b/daemon/daemon_unix.go
-@@ -1190,6 +1190,12 @@ func (daemon *Daemon) initCgroupsPath(path string) error {
- 		return nil
- 	}
- 
-+	if daemon.configStore.CPURealtimePeriod == 0 && daemon.configStore.CPURealtimeRuntime == 0 {
-+		return nil
-+	}
-+
-+	// Recursively create cgroup to ensure that the system and all parent cgroups have values set
-+	// for the period and runtime as this limits what the children can be set to.
- 	daemon.initCgroupsPath(filepath.Dir(path))
- 
- 	_, root, err := cgroups.FindCgroupMountpointAndRoot("cpu")
-@@ -1198,16 +1204,19 @@ func (daemon *Daemon) initCgroupsPath(path string) error {
- 	}
- 
- 	path = filepath.Join(root, path)
--	sysinfo := sysinfo.New(false)
--	if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) {
--		return err
--	}
-+	sysinfo := sysinfo.New(true)
- 	if sysinfo.CPURealtimePeriod && daemon.configStore.CPURealtimePeriod != 0 {
-+		if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) {
-+			return err
-+		}
- 		if err := ioutil.WriteFile(filepath.Join(path, "cpu.rt_period_us"), []byte(strconv.FormatInt(daemon.configStore.CPURealtimePeriod, 10)), 0700); err != nil {
- 			return err
- 		}
- 	}
- 	if sysinfo.CPURealtimeRuntime && daemon.configStore.CPURealtimeRuntime != 0 {
-+		if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) {
-+			return err
-+		}
- 		if err := ioutil.WriteFile(filepath.Join(path, "cpu.rt_runtime_us"), []byte(strconv.FormatInt(daemon.configStore.CPURealtimeRuntime, 10)), 0700); err != nil {
- 			return err
- 		}