diff mbox series

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

Message ID 6852bbd1-a57f-4358-85f3-c4eed593278c@siemens.com
State Accepted, archived
Headers show
Series [v2] docker-loader: Add missing dependency for trixie | expand

Commit Message

Jan Kiszka Nov. 24, 2025, 5:28 p.m. UTC 
From: Jan Kiszka <jan.kiszka@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.kiszka@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(-)

Comments

Zhihang Wei Nov. 27, 2025, 2:56 p.m. UTC | #1 
Applied to next, thanks.

Best regards,
Zhihang

On 11/24/25 18:28, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@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.kiszka@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"
diff mbox series

Patch

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"