From 957fa278aa5f152da2a588a1a28f650ba7fe807d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Nov 28 2017 15:26:49 +0000 Subject: sync centos and fedora unitfiles Signed-off-by: Lokesh Mandvekar --- diff --git a/docker.service b/docker.service index 6ae8e28..a57b189 100644 --- a/docker.service +++ b/docker.service @@ -27,7 +27,7 @@ ExecStart=/usr/bin/dockerd-current \ $ADD_REGISTRY \ $BLOCK_REGISTRY \ $INSECURE_REGISTRY \ - $REGISTRIES + $REGISTRIES ExecReload=/bin/kill -s HUP $MAINPID TasksMax=8192 LimitNOFILE=1048576 diff --git a/docker.service.centos b/docker.service.centos index 130b676..a09abad 100644 --- a/docker.service.centos +++ b/docker.service.centos @@ -3,10 +3,11 @@ Description=Docker Application Container Engine Documentation=http://docs.docker.com After=network.target docker-containerd.service Wants=docker-storage-setup.service -Requires=docker-containerd.service rhel-push-plugin.socket +Requires=docker-containerd.service rhel-push-plugin.socket registries.service [Service] Type=notify +EnvironmentFile=/run/containers/registries.conf EnvironmentFile=-/etc/sysconfig/docker EnvironmentFile=-/etc/sysconfig/docker-storage EnvironmentFile=-/etc/sysconfig/docker-network @@ -18,12 +19,15 @@ ExecStart=/usr/bin/dockerd-current \ --containerd /run/containerd.sock \ --exec-opt native.cgroupdriver=systemd \ --userland-proxy-path=/usr/libexec/docker/docker-proxy-current \ + --init-path=/usr/libexec/docker/docker-init-current \ + --seccomp-profile=/etc/docker/seccomp.json \ $OPTIONS \ $DOCKER_STORAGE_OPTIONS \ $DOCKER_NETWORK_OPTIONS \ $ADD_REGISTRY \ $BLOCK_REGISTRY \ - $INSECURE_REGISTRY + $INSECURE_REGISTRY \ + $REGISTRIES ExecReload=/bin/kill -s HUP $MAINPID LimitNOFILE=1048576 LimitNPROC=1048576