docker: enable docker.socket instead of docker.service
PATCH 1/1 docker: enable docker.socket instead of docker.service
The docker daemon supports systemd socket activation. If we enable docker.socket (and not docker.service) then the daemon will be started when it is first used.
Signed-off-by Dan Callaghan <[email protected]>
--- recipes-containers/docker/docker.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-containers/docker/docker.inc +1 -1
@@ -49,7 +49,7 @@ PACKAGECONFIG[transient-config] = "transient-config" inherit systemd update-rc.d SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}" +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.socket','',d)}" SYSTEMD_AUTO_ENABLE_${PN} = "enable" INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}"
Signature · 1 line
2.25.4
Looks fine to me.
Merged.
Bruce
In message: [meta-virtualization][PATCH] docker: enable docker.socket instead of docker.service
Quoted 27 lines · on 03/06/2020 Dan Callaghan wrote:
The docker daemon supports systemd socket activation. If we enable docker.socket (and not docker.service) then the daemon will be started when it is first used.
Signed-off-by Dan Callaghan <[email protected]>--- recipes-containers/docker/docker.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)recipes-containers/docker/docker.inc +1
-1@@ -49,7 +49,7 @@ PACKAGECONFIG[transient-config] = "transient-config" inherit systemd update-rc.d SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}" +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.socket','',d)}" SYSTEMD_AUTO_ENABLE_${PN} = "enable" INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}"Signature · 1 line
2.25.4