toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09

Browse Source
This commit is contained in:
GordonTheTurtle
2018-08-24 23:01:13 +00:00
parent 357d520355 90b540baa9
commit 217d24056c
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/packaging/containerd.mk
+1 -1
View File
@@ -1,6 +1,6 @@
# Common things for containerd functionality
CONTAINERD_PROXY_COMMIT=82ae3d13e91d062dd4853379fe018638023c8da2
CONTAINERD_PROXY_COMMIT=afca176732d9416fac1e79fd76ce45afe4cbc41f
CONTAINERD_SHIM_PROCESS_IMAGE=docker.io/docker/containerd-shim-process:ff98a47
# If containerd is running use that socket instead
components/packaging/systemd/docker.service
+1
View File
@@ -10,6 +10,7 @@ Wants=network-online.target
ExecStartPre=/usr/libexec/containerd-offline-installer /var/lib/containerd-offline-installer/containerd-shim-process.tar docker.io/docker/containerd-shim-process
ExecStart=/usr/bin/dockerd
TimeoutSec=0
RestartSec=2
Restart=always
# On RPM Based distributions PATH isn't defined so we define it here
# /opt/containerd/bin is in front so dockerd grabs the correct runc binary