diff options
| author | Kiwoong Ha <kw1981.ha@samsung.com> | 2022-09-26 18:31:44 +0900 |
|---|---|---|
| committer | Kiwoong Ha <kw1981.ha@samsung.com> | 2022-09-27 12:52:17 +0900 |
| commit | b16df5769e35118ba254a81e46e49acce49ff283 (patch) | |
| tree | 1b3c02a2355286e236305f1679a9bb49d16dbec4 | |
| parent | 2cf048e3ebc1f370cd382bd43910a6491d83de78 (diff) | |
| download | docker-engine-tizen_8.0.tar.gz docker-engine-tizen_8.0.tar.bz2 docker-engine-tizen_8.0.zip | |
Fix side effect(host target rebooting issue) when enlightenment killed in container.tizen_9.0_m2_releasetizen_8.0_m2_releaseaccepted/tizen/unified/20221102.020509accepted/tizen/9.0/unified/20241030.231655accepted/tizen/8.0/unified/20231005.094801tizen_9.0tizen_8.0tizenaccepted/tizen_unifiedaccepted/tizen_9.0_unifiedaccepted/tizen_8.0_unified
Revert "runc: Make not to create docker folder in the watchdog cgroup"
This reverts commit bd883d50e34b6131376c829a8bbe6fe0ae23ab8f.
Revert "Revert "systemd/docker-engine.service: early disable docker watchdog cgroup""
This reverts commit ac86c84af189c0a780914ec2eb68bff097022dbe.
Change-Id: Id666a782f465549487b205b50585216c450468d9
Signed-off-by: Kiwoong Ha <kw1981.ha@samsung.com>
| -rwxr-xr-x | prebuilt/overlay/runc-aarch64 | bin | 16409632 -> 16409856 bytes | |||
| -rwxr-xr-x | prebuilt/overlay/runc-arm | bin | 15214036 -> 15214300 bytes | |||
| -rwxr-xr-x | prebuilt/overlay/runc-x86_64 | bin | 17344192 -> 17344640 bytes | |||
| -rw-r--r-- | systemd/docker-engine.service | 1 |
4 files changed, 1 insertions, 0 deletions
diff --git a/prebuilt/overlay/runc-aarch64 b/prebuilt/overlay/runc-aarch64 Binary files differindex 396e48f..c69e448 100755 --- a/prebuilt/overlay/runc-aarch64 +++ b/prebuilt/overlay/runc-aarch64 diff --git a/prebuilt/overlay/runc-arm b/prebuilt/overlay/runc-arm Binary files differindex c961a0c..5bdb90b 100755 --- a/prebuilt/overlay/runc-arm +++ b/prebuilt/overlay/runc-arm diff --git a/prebuilt/overlay/runc-x86_64 b/prebuilt/overlay/runc-x86_64 Binary files differindex 208106b..27f7308 100755 --- a/prebuilt/overlay/runc-x86_64 +++ b/prebuilt/overlay/runc-x86_64 diff --git a/systemd/docker-engine.service b/systemd/docker-engine.service index 0dc8b4f..44db9a0 100644 --- a/systemd/docker-engine.service +++ b/systemd/docker-engine.service @@ -8,6 +8,7 @@ Requires=docker-engine.socket Type=notify SmackProcessLabel=System::Privileged ExecStart=/usr/bin/dockerd --userland-proxy=false --data-root /opt/var/lib/docker -H fd:// -H tcp://0.0.0.0:2375 --bridge none +ExecStartPost=-/bin/sh -c "mkdir /sys/fs/cgroup/watchdog/docker; test -d /sys/fs/cgroup/watchdog/docker && echo 0 > /sys/fs/cgroup/watchdog/docker/notify_on_release" ExecReload=/bin/kill -s HUP $MAINPID LimitNOFILE=1048576 # Having non-zero Limit*s causes performance problems due to accounting overhead |