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

backport of #1307 (docker: update to 1.13.1)
LibreELEC · Feb 12, 2017 · 0ffe72b · 0ffe72b
2 parents 88d0220 + 3dfd23d
commit 0ffe72b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 66 deletions.
diff --git a/packages/addons/addon-depends/containerd/package.mk b/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/"

diff --git a/packages/addons/addon-depends/go/package.mk b/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"

diff --git a/packages/addons/addon-depends/runc/package.mk b/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"

diff --git a/packages/addons/service/docker/changelog.txt b/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

diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk
@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="docker"
-PKG_VERSION="1.13.0"
-PKG_REV="112"
+PKG_VERSION="1.13.1"
+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

diff --git a/packages/addons/service/docker/patches/docker-002-PR29846.patch b/packages/addons/service/docker/patches/docker-002-PR29846.patch