diff --git a/packages/addons/addon-depends/runc/package.mk b/packages/addons/addon-depends/runc/package.mk index fe773eae2e..f875904826 100644 --- a/packages/addons/addon-depends/runc/package.mk +++ b/packages/addons/addon-depends/runc/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="runc" -PKG_VERSION="1.0.0-rc92" -PKG_SHA256="28378df983a3c586ed3ec8c76a774a9b10f36a0c323590a284b801cce95cc61f" +PKG_VERSION="1.0.0-rc93" +PKG_SHA256="e42456078d2f76c925cdd656e4f423b918525d8188521de05e893b6bb473a6f8" PKG_LICENSE="APL" PKG_SITE="https://github.com/opencontainers/runc" PKG_URL="https://github.com/opencontainers/runc/archive/v${PKG_VERSION}.tar.gz" @@ -13,7 +13,7 @@ PKG_LONGDESC="A CLI tool for spawning and running containers according to the OC PKG_TOOLCHAIN="manual" # Git commit of the matching release https://github.com/opencontainers/runc/releases -PKG_GIT_COMMIT="ff819c7e9184c13b7c2607fe6c30ae19403a7aff" +PKG_GIT_COMMIT="12644e614e25b05da6fd08a38ffa0cfe1903fdec" pre_make_target() { go_configure diff --git a/packages/addons/service/docker/changelog.txt b/packages/addons/service/docker/changelog.txt index af427a7998..7430498942 100644 --- a/packages/addons/service/docker/changelog.txt +++ b/packages/addons/service/docker/changelog.txt @@ -1,3 +1,7 @@ +133 +- Update to docker 19.03.15 +- runc: update to 1.0.0-rc93 + 132 - Fix python addon diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index 9f87421aac..969660ee76 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -3,9 +3,9 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="docker" -PKG_VERSION="19.03.14" -PKG_SHA256="0b8838b0da1f1368fc1a0809a2ed11840bd7d58df1f090e668de209faddcef7c" -PKG_REV="132" +PKG_VERSION="19.03.15" +PKG_SHA256="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd" +PKG_REV="133" PKG_ARCH="any" PKG_LICENSE="ASL" PKG_SITE="http://www.docker.com/" @@ -17,7 +17,7 @@ PKG_LONGDESC="Docker containers can encapsulate any payload, and will run consis PKG_TOOLCHAIN="manual" # Git commit of the matching release https://github.com/docker/docker-ce/releases -export PKG_GIT_COMMIT="4484c46d9d1a2d10b8fc662923ad586daeedb04f" +export PKG_GIT_COMMIT="99e3ed89195c4e551e87aad1e7453b65456b03ad" PKG_IS_ADDON="yes" PKG_ADDON_NAME="Docker" @@ -74,6 +74,9 @@ configure_target() { mkdir -p ${PKG_GOPATH_CLI}/src/github.com/docker/docker/builder cp -rf ${PKG_ENGINE_PATH}/builder/* ${PKG_GOPATH_CLI}/src/github.com/docker/docker/builder + mkdir -p ${PKG_GOPATH_CLI}/src/github.com/docker/docker/pkg/idtools + cp -rf ${PKG_ENGINE_PATH}/pkg/idtools/* ${PKG_GOPATH_CLI}/src/github.com/docker/docker/pkg/idtools + if [ ! -L ${PKG_GOPATH_ENGINE}/src/github.com/docker/docker ]; then ln -fs ${PKG_ENGINE_PATH} ${PKG_GOPATH_ENGINE}/src/github.com/docker/docker fi