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

docker: update to 1.13.1

Browse Source
This commit is contained in:
Lukas Rusak 2017-02-09 01:01:24 -08:00
parent 04c94b377d
commit 63b3937e96
No known key found for this signature in database
GPG Key ID: 8C310C807E7393A3
3 changed files with 9 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -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"
PKG_LICENSE="ASL"
@ -72,7 +72,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

60
packages/addons/service/docker/patches/docker-002-PR29846.patch
View File

@ -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
}