MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

docker: Move /etc/docker to a symlink to volatiles

Browse Source 
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>
This commit is contained in:
Tom Rini 2019-02-08 13:22:35 -05:00 committed by Bruce Ashfield
parent ba2d65e6bc
commit 72a920412f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
recipes-containers/docker/docker-ce_git.bb
View File

@ -148,6 +148,9 @@ do_install() {
install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
fi 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/ mkdir -p ${D}${datadir}/docker/
install -m 0755 ${S}/src/import/components/engine/contrib/check-config.sh ${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}" USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "-r docker" 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" FILES_${PN}-contrib += "${datadir}/docker/check-config.sh"
RDEPENDS_${PN}-contrib += "bash" RDEPENDS_${PN}-contrib += "bash"

5
recipes-containers/docker/docker_git.bb
View File

@ -154,6 +154,9 @@ do_install() {
install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
fi 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/ mkdir -p ${D}${datadir}/docker/
install -m 0755 ${S}/src/import/contrib/check-config.sh ${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}" USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "-r docker" 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" FILES_${PN}-contrib += "${datadir}/docker/check-config.sh"
RDEPENDS_${PN}-contrib += "bash" RDEPENDS_${PN}-contrib += "bash"