summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2019-06-28 14:14:06 +0200
committerBruce Ashfield <bruce.ashfield@gmail.com>2019-07-03 08:47:08 -0400
commiteaba9b3acc6c8169dc43ac800848ef74424eba24 (patch)
treee1b08e9c4bc3e495a42678e22b5a763bfe0c740a
parenta7da69d1faaef9f679fcad76b4f63f2f2c6d4ada (diff)
downloadmeta-virtualization-eaba9b3acc6c8169dc43ac800848ef74424eba24.tar.gz
docker: make docker-init a runtime dependency by default
If docker run --init is used docker expects docker-init to be present, if not Docker fails to start the container with the following error: docker: Error response from daemon: exec: "docker-init": executable file not found in $PATH. However, docker-init does not get deployed by default since commit d19fda374317 ("docker: consolidate common depends/options"). Readd docker-init through a PACKAGECONFIG RDEPENDS to make sure it gets deployed by default again. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/docker/docker.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc
index 168d2965..eacaf7f4 100644
--- a/recipes-containers/docker/docker.inc
+++ b/recipes-containers/docker/docker.inc
@@ -32,8 +32,9 @@ RDEPENDS_${PN} += "virtual/containerd virtual/runc"
32RRECOMMENDS_${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat" 32RRECOMMENDS_${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat"
33 33
34inherit pkgconfig 34inherit pkgconfig
35PACKAGECONFIG ??= "" 35PACKAGECONFIG ??= "docker-init"
36PACKAGECONFIG[seccomp] = "seccomp,,libseccomp" 36PACKAGECONFIG[seccomp] = "seccomp,,libseccomp"
37PACKAGECONFIG[docker-init] = ",,,docker-init"
37 38
38inherit systemd update-rc.d 39inherit systemd update-rc.d
39 40