diff --git a/Dockerfile b/Dockerfile index c9d1801..d740562 100644 --- a/Dockerfile +++ b/Dockerfile @@ -87,7 +87,7 @@ RUN zypper in -y \ mdadm \ multipath-tools \ nano \ - net-tools \ + net-tools-deprecated \ netcat-openbsd \ nfs-utils \ open-iscsi \ diff --git a/framework/files/etc/systemd/system/multi-user.target.wants/docker.service b/framework/files/etc/systemd/system/multi-user.target.wants/docker.service deleted file mode 100644 index fab73b8..0000000 --- a/framework/files/etc/systemd/system/multi-user.target.wants/docker.service +++ /dev/null @@ -1,47 +0,0 @@ -[Unit] -Description=Docker Application Container Engine -Documentation=https://docs.docker.com -After=network-online.target docker.socket firewalld.service containerd.service -Wants=network-online.target containerd.service -Requires=docker.socket - -[Service] -Type=notify -# the default is not to use systemd for cgroups because the delegate issues still -# exists and systemd currently does not support the cgroup feature set required -# for containers run by docker -ExecStart=/usr/bin/dockerd -H fd:// --containerd=/run/containerd/containerd.sock -ExecReload=/bin/kill -s HUP $MAINPID -TimeoutStartSec=0 -RestartSec=2 -Restart=always - -# Note that StartLimit* options were moved from "Service" to "Unit" in systemd 229. -# Both the old, and new location are accepted by systemd 229 and up, so using the old location -# to make them work for either version of systemd. -StartLimitBurst=3 - -# Note that StartLimitInterval was renamed to StartLimitIntervalSec in systemd 230. -# Both the old, and new name are accepted by systemd 230 and up, so using the old name to make -# this option work for either version of systemd. -StartLimitInterval=60s - -# Having non-zero Limit*s causes performance problems due to accounting overhead -# in the kernel. We recommend using cgroups to do container-local accounting. -LimitNOFILE=infinity -LimitNPROC=infinity -LimitCORE=infinity - -# Comment TasksMax if your systemd version does not support it. -# Only systemd 226 and above support this option. -TasksMax=infinity - -# set delegate yes so that systemd does not reset the cgroups of docker containers -Delegate=yes - -# kill only the docker process, not all processes in the cgroup -KillMode=process -OOMScoreAdjust=-500 - -[Install] -WantedBy=multi-user.target diff --git a/framework/files/etc/systemd/system/multi-user.target.wants/docker.service b/framework/files/etc/systemd/system/multi-user.target.wants/docker.service new file mode 120000 index 0000000..dd74917 --- /dev/null +++ b/framework/files/etc/systemd/system/multi-user.target.wants/docker.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/docker.service \ No newline at end of file