From 72a920412f0eead836cd2128144988152534882f Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Fri, 8 Feb 2019 13:22:35 -0500
Subject: [PATCH] docker: Move /etc/docker to a symlink to volatiles

The only thing which docker uses /etc/docker for is a TLS key for
connecting with other TLS-enabled services.  Make /etc/docker a symlink
to the existing docker volatiles directory so that we can use docker on
a read-only rootfs.

Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 recipes-containers/docker/docker-ce_git.bb | 5 ++++-
 recipes-containers/docker/docker_git.bb    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb
index caf6d704..05eac21f 100644
--- a/recipes-containers/docker/docker-ce_git.bb
+++ b/recipes-containers/docker/docker-ce_git.bb
@@ -148,6 +148,9 @@ do_install() {
 		install -d ${D}${sysconfdir}/init.d
 		install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
 	fi
+	# TLS key that docker creates at run-time if not found is what resides here
+	install -d ${D}${sysconfdir}
+	ln -s ..${localstatedir}/run/docker ${D}${sysconfdir}/docker
 
 	mkdir -p ${D}${datadir}/docker/
 	install -m 0755 ${S}/src/import/components/engine/contrib/check-config.sh ${D}${datadir}/docker/
@@ -157,7 +160,7 @@ inherit useradd
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "-r docker"
 
-FILES_${PN} += "${systemd_unitdir}/system/*"
+FILES_${PN} += "${systemd_unitdir}/system/* ${sysconfdir}/docker"
 
 FILES_${PN}-contrib += "${datadir}/docker/check-config.sh"
 RDEPENDS_${PN}-contrib += "bash"
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index 79578083..19e773b0 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -154,6 +154,9 @@ do_install() {
 		install -d ${D}${sysconfdir}/init.d
 		install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
 	fi
+	# TLS key that docker creates at run-time if not found is what resides here
+	install -d ${D}${sysconfdir}
+	ln -s ..${localstatedir}/run/docker ${D}${sysconfdir}/docker
 
 	mkdir -p ${D}${datadir}/docker/
 	install -m 0755 ${S}/src/import/contrib/check-config.sh ${D}${datadir}/docker/
@@ -163,7 +166,7 @@ inherit useradd
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "-r docker"
 
-FILES_${PN} += "${systemd_unitdir}/system/*"
+FILES_${PN} += "${systemd_unitdir}/system/* ${sysconfdir}/docker"
 
 FILES_${PN}-contrib += "${datadir}/docker/check-config.sh"
 RDEPENDS_${PN}-contrib += "bash"