summaryrefslogtreecommitdiffstats
path: root/recipes-containers/docker/files/docker.service
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-05-02 13:50:02 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2016-05-02 14:02:42 -0400
commit6f17a76ac15f5cd619b70c1b60e54cf0dead477e (patch)
tree39e9bb159d6b7cd81ffb119f132b903a6dc7b8d8 /recipes-containers/docker/files/docker.service
parentfd1a6d1bd31ead568f17a24ab7d7487c7f3514d6 (diff)
downloadmeta-virtualization-6f17a76ac15f5cd619b70c1b60e54cf0dead477e.tar.gz
docker: uprev to 1.11.1
Updating docker to the 1.11.1 release, which uses the open container initiative components. With this udpate, we drop patches that are no longer required, and adjust the install/strip routines to not look for obselete components. There are now 4 binaries required for docker to work: - docker - docker-containerd - docker-containerd-shim - docker-runc The new containerd and runc recipes provide the latter, while docker provides the cli and daemon. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/docker/files/docker.service')
-rw-r--r--recipes-containers/docker/files/docker.service2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-containers/docker/files/docker.service b/recipes-containers/docker/files/docker.service
index 68010319..eaa3319f 100644
--- a/recipes-containers/docker/files/docker.service
+++ b/recipes-containers/docker/files/docker.service
@@ -5,7 +5,7 @@ After=network.target docker.socket
5Requires=docker.socket 5Requires=docker.socket
6 6
7[Service] 7[Service]
8ExecStart=/usr/bin/docker -d -H fd:// --registry-mirror=http://localhost:5000 --insecure-registry=http://localhost:5000 8ExecStart=/usr/bin/docker daemon -H fd:// --registry-mirror=http://localhost:5000 --insecure-registry=http://localhost:5000 --raw-logs
9MountFlags=slave 9MountFlags=slave
10LimitNOFILE=1048576 10LimitNOFILE=1048576
11LimitNPROC=1048576 11LimitNPROC=1048576