jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-30 14:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4712 from heitbaum/docker2

Browse Source 
docker: update to 19.03.14 // including supporting packages
This commit is contained in:
CvH 2020-12-10 20:24:18 +01:00 committed by GitHub
commit 222c080126
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/addons/addon-depends/containerd/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="containerd"
PKG_VERSION="1.3.7"
PKG_SHA256="d30d59e143697aa4f0960205b3f5ac59c573b332f20507740ef2dc0fb5ae8ded"
PKG_VERSION="1.3.9"
PKG_SHA256="9244212589c84b12262769dca6fb985c0c680cb5259c8904b29c511d81fd62d0"
PKG_LICENSE="APL"
PKG_SITE="https://containerd.tools/"
PKG_URL="https://github.com/containerd/containerd/archive/v$PKG_VERSION.tar.gz"

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

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="go"
PKG_VERSION="1.14.11"
PKG_SHA256="a087717fcf7696b9983dddf48d04da7610e2ca87d7ada57a878658253b89f886"
PKG_VERSION="1.14.12"
PKG_SHA256="f55a44ff20d75f1166a36f5a0c387190fbcd2570db91c1d24c95ba185404fc63"
PKG_LICENSE="BSD"
PKG_SITE="https://golang.org"
PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz"

4
packages/addons/addon-depends/libnetwork/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libnetwork"
PKG_VERSION="535ef365dc1dd82a5135803a58bc6198a3b9aa27"
PKG_SHA256="19743ff09198d7b16bbfe9fcd26fc82781982a4a11b0bc4f46eaaeff8a555ccd"
PKG_VERSION="a543cbc4871f904b0efe205708eb45d72e65fd8b"
PKG_SHA256="3e3b0048aa468de0fe33ad2c08bf3891ac1a72fca434f92620312da51f344488"
PKG_LICENSE="APL"
PKG_SITE="https://github.com/docker/libnetwork"
PKG_URL="https://github.com/docker/libnetwork/archive/${PKG_VERSION}.tar.gz"

6
packages/addons/addon-depends/runc/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="runc"
PKG_VERSION="1.0.0-rc8"
PKG_SHA256="efe4ff9bbe49b19074346d65c914d809c0a3e90d062ea9619fe240f931f0b700"
PKG_VERSION="1.0.0-rc92"
PKG_SHA256="28378df983a3c586ed3ec8c76a774a9b10f36a0c323590a284b801cce95cc61f"
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="425e105d5a03fabd737a126ad93d62a9eeede87f"
PKG_GIT_COMMIT="ff819c7e9184c13b7c2607fe6c30ae19403a7aff"
pre_make_target() {
go_configure

20
packages/addons/addon-depends/runc/patches/runc-001-reenable-systemd-on-static-build.patch
View File

@ -1,20 +0,0 @@
diff --git a/libcontainer/cgroups/systemd/apply_nosystemd.go b/libcontainer/cgroups/systemd/apply_nosystemd.go
index a65d8e44..b897564c 100644
--- a/libcontainer/cgroups/systemd/apply_nosystemd.go
+++ b/libcontainer/cgroups/systemd/apply_nosystemd.go
@@ -1,4 +1,4 @@
-// +build !linux static_build
+// +build !linux
package systemd
diff --git a/libcontainer/cgroups/systemd/apply_systemd.go b/libcontainer/cgroups/systemd/apply_systemd.go
index d9d8302d..de89ccbe 100644
--- a/libcontainer/cgroups/systemd/apply_systemd.go
+++ b/libcontainer/cgroups/systemd/apply_systemd.go
@@ -1,4 +1,4 @@
-// +build linux,!static_build
+// +build linux
package systemd

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

@ -1,3 +1,6 @@
131
- Update to docker 19.03.14
130
- Update to docker 19.03.13

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

@ -3,9 +3,9 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="docker"
PKG_VERSION="19.03.13"
PKG_SHA256="b2ff08675738031b6d6d59a90226657c16726851957c11b5fb85a4598b933b92"
PKG_REV="130"
PKG_VERSION="19.03.14"
PKG_SHA256="0b8838b0da1f1368fc1a0809a2ed11840bd7d58df1f090e668de209faddcef7c"
PKG_REV="131"
PKG_ARCH="any"
PKG_LICENSE="ASL"
PKG_SITE="http://www.docker.com/"