From d8abae5613f03b79bb658dd0d97019b8330327d6 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Wed, 22 Jul 2015 01:24:28 -0700 Subject: [PATCH] app-emulation/docker: sync systemd socket unit with upstream 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. --- .../docker/{docker-1.7.1.ebuild => docker-1.7.1-r1.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 2 +- .../coreos-overlay/app-emulation/docker/files/docker.socket | 4 +++- .../app-emulation/docker/files/early-docker.socket | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.7.1.ebuild => docker-1.7.1-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index e4a9b9abfc..40905ef61f 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -13,7 +13,7 @@ CROS_WORKON_REPO="git://github.com" if [[ ${PV} == *9999 ]]; then DOCKER_GITCOMMIT="unknown" - KEYWORDS="" + KEYWORDS="~amd64 ~arm64" else CROS_WORKON_COMMIT="786b29d4db80a6175e72b47a794ee044918ba734" # v1.7.1 DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.socket b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.socket index 1d541d11b3..5a96c40f83 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.socket +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.socket @@ -1,11 +1,13 @@ [Unit] Description=Docker Socket for the API +PartOf=docker.service [Socket] +ListenStream=/var/run/docker.sock SocketMode=0660 SocketUser=docker SocketGroup=docker -ListenStream=/var/run/docker.sock [Install] WantedBy=sockets.target + diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.socket b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.socket index cc5144e2a2..648b3ed417 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.socket +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.socket @@ -1,5 +1,6 @@ [Unit] Description=Early Docker Socket for the API +PartOf=early-docker.service [Socket] ListenStream=/var/run/early-docker.sock