[PATCH] docker-loader: Add missing dependency for trixie

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

The docker command comes with docker-cli from trixie onward.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
meta/recipes-support/container-loader/docker-loader.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/container-loader/docker-loader.inc b/meta/recipes-support/container-loader/docker-loader.inc
index b864c854..bb33283d 100644
--- a/meta/recipes-support/container-loader/docker-loader.inc
+++ b/meta/recipes-support/container-loader/docker-loader.inc
@@ -7,4 +7,4 @@ require container-loader.inc

CONTAINER_ENGINE = "docker"

-CONTAINER_ENGINE_PACKAGES ?= "docker.io, apparmor"
+CONTAINER_ENGINE_PACKAGES ?= "docker-cli | docker.io, apparmor"
--
2.51.0

[Jan Kiszka]

Too fast: now we are missing the docker.io core. We need both, so we
need to adjust the dependencies at build time. v2 is on the way.

Jan

--
Siemens AG, Foundational Technologies
Linux Expert Center

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

The docker command comes with docker-cli from trixie onward. We still
need to list docker.io explicitly as it is no dependency of docker-cli.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---

Changes in v2:
- we still need the core docker.io, not only the cli

meta/recipes-support/container-loader/docker-loader.inc | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/container-loader/docker-loader.inc b/meta/recipes-support/container-loader/docker-loader.inc
index b864c854..18604565 100644
--- a/meta/recipes-support/container-loader/docker-loader.inc
+++ b/meta/recipes-support/container-loader/docker-loader.inc
@@ -7,4 +7,9 @@ require container-loader.inc

CONTAINER_ENGINE = "docker"

-CONTAINER_ENGINE_PACKAGES ?= "docker.io, apparmor"

+DOCKER_PKGS = "docker-cli, docker.io"
+DOCKER_PKGS:buster = "docker.io"
+DOCKER_PKGS:bullseye = "docker.io"
+DOCKER_PKGS:bookworm = "docker.io"
+
+CONTAINER_ENGINE_PACKAGES ?= "${DOCKER_PKGS}, apparmor"
--
2.51.0

[Zhihang Wei]

Applied to next, thanks.

Best regards,
Zhihang