summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-containers/docker/docker-ce_git.bb5
-rw-r--r--recipes-containers/docker/docker_git.bb5
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() {
148 install -d ${D}${sysconfdir}/init.d 148 install -d ${D}${sysconfdir}/init.d
149 install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init 149 install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
150 fi 150 fi
151 # TLS key that docker creates at run-time if not found is what resides here
152 install -d ${D}${sysconfdir}
153 ln -s ..${localstatedir}/run/docker ${D}${sysconfdir}/docker
151 154
152 mkdir -p ${D}${datadir}/docker/ 155 mkdir -p ${D}${datadir}/docker/
153 install -m 0755 ${S}/src/import/components/engine/contrib/check-config.sh ${D}${datadir}/docker/ 156 install -m 0755 ${S}/src/import/components/engine/contrib/check-config.sh ${D}${datadir}/docker/
@@ -157,7 +160,7 @@ inherit useradd
157USERADD_PACKAGES = "${PN}" 160USERADD_PACKAGES = "${PN}"
158GROUPADD_PARAM_${PN} = "-r docker" 161GROUPADD_PARAM_${PN} = "-r docker"
159 162
160FILES_${PN} += "${systemd_unitdir}/system/*" 163FILES_${PN} += "${systemd_unitdir}/system/* ${sysconfdir}/docker"
161 164
162FILES_${PN}-contrib += "${datadir}/docker/check-config.sh" 165FILES_${PN}-contrib += "${datadir}/docker/check-config.sh"
163RDEPENDS_${PN}-contrib += "bash" 166RDEPENDS_${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() {
154 install -d ${D}${sysconfdir}/init.d 154 install -d ${D}${sysconfdir}/init.d
155 install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init 155 install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
156 fi 156 fi
157 # TLS key that docker creates at run-time if not found is what resides here
158 install -d ${D}${sysconfdir}
159 ln -s ..${localstatedir}/run/docker ${D}${sysconfdir}/docker
157 160
158 mkdir -p ${D}${datadir}/docker/ 161 mkdir -p ${D}${datadir}/docker/
159 install -m 0755 ${S}/src/import/contrib/check-config.sh ${D}${datadir}/docker/ 162 install -m 0755 ${S}/src/import/contrib/check-config.sh ${D}${datadir}/docker/
@@ -163,7 +166,7 @@ inherit useradd
163USERADD_PACKAGES = "${PN}" 166USERADD_PACKAGES = "${PN}"
164GROUPADD_PARAM_${PN} = "-r docker" 167GROUPADD_PARAM_${PN} = "-r docker"
165 168
166FILES_${PN} += "${systemd_unitdir}/system/*" 169FILES_${PN} += "${systemd_unitdir}/system/* ${sysconfdir}/docker"
167 170
168FILES_${PN}-contrib += "${datadir}/docker/check-config.sh" 171FILES_${PN}-contrib += "${datadir}/docker/check-config.sh"
169RDEPENDS_${PN}-contrib += "bash" 172RDEPENDS_${PN}-contrib += "bash"