mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-23 15:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-emulation/docker: invoke dockerd, not docker-daemon

Browse Source
This commit is contained in:
Nick Owens 2016-08-11 15:00:59 -07:00
parent e1d73ac7bc
commit e58c75a8be
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.1-r1.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service vendored
View File

@ -9,7 +9,7 @@ EnvironmentFile=-/run/flannel_docker_opts.env
MountFlags=slave
LimitNOFILE=1048576
LimitNPROC=1048576
ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// $DOCKER_OPTS $DOCKER_CGROUPS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ
ExecStart=/usr/lib/coreos/dockerd --host=fd:// $DOCKER_OPTS $DOCKER_CGROUPS $DOCKER_OPT_BIP $DOCKER_OPT_MTU $DOCKER_OPT_IPMASQ
[Install]
WantedBy=multi-user.target

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd vendored
View File

@ -87,4 +87,4 @@ if [[ -z "${ARG_SELINUX}" ]]; then
maybe_enable_selinux
fi
exec docker "$@" ${USE_SELINUX}
exec dockerd "$@" ${USE_SELINUX}

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service vendored
View File

@ -9,7 +9,7 @@ Environment=TMPDIR=/var/tmp
MountFlags=slave
LimitNOFILE=1048576
LimitNPROC=1048576
ExecStart=/usr/lib/coreos/dockerd daemon --host=fd:// --bridge=none --iptables=false --ip-masq=false --exec-root=/var/run/early-docker --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid $DOCKER_OPTS $DOCKER_CGROUPS
ExecStart=/usr/lib/coreos/dockerd --host=fd:// --bridge=none --iptables=false --ip-masq=false --exec-root=/var/run/early-docker --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid $DOCKER_OPTS $DOCKER_CGROUPS
[Install]
WantedBy=early-docker.target