mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-22 06:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-emulation/docker: sync systemd socket unit with upstream

Browse Source 
without PartOf=docker.service, the docker socket gets permanently
unlinked when docker is restarted, resulting in a running docker daemon
but inability to contact it.

see docker commit 053c3557b3198466ecfbe066fefdbab2a78771d5 and
 https://github.com/golang/go/issues/11826 for more details.
This commit is contained in:
Nick Owens 2015-07-22 01:24:28 -07:00
parent 823c03873f
commit d8abae5613
4 changed files with 5 additions and 2 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.7.1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r1.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

@ -13,7 +13,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ ${PV} == *9999 ]]; then if [[ ${PV} == *9999 ]]; then
DOCKER_GITCOMMIT="unknown" DOCKER_GITCOMMIT="unknown"
KEYWORDS="" KEYWORDS="~amd64 ~arm64"
else else
CROS_WORKON_COMMIT="786b29d4db80a6175e72b47a794ee044918ba734" # v1.7.1 CROS_WORKON_COMMIT="786b29d4db80a6175e72b47a794ee044918ba734" # v1.7.1
DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}"

4
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.socket vendored
View File

@ -1,11 +1,13 @@
[Unit] [Unit]
Description=Docker Socket for the API Description=Docker Socket for the API
PartOf=docker.service
[Socket] [Socket]
ListenStream=/var/run/docker.sock
SocketMode=0660 SocketMode=0660
SocketUser=docker SocketUser=docker
SocketGroup=docker SocketGroup=docker
ListenStream=/var/run/docker.sock
[Install] [Install]
WantedBy=sockets.target WantedBy=sockets.target

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

@ -1,5 +1,6 @@
[Unit] [Unit]
Description=Early Docker Socket for the API Description=Early Docker Socket for the API
PartOf=early-docker.service
[Socket] [Socket]
ListenStream=/var/run/early-docker.sock ListenStream=/var/run/early-docker.sock