docker-loader: Add missing dependency for trixie

Message ID e8f49780-ed6b-4d09-b1e9-96a099d0d524@siemens.com
State Superseded
Headers show
Series docker-loader: Add missing dependency for trixie | expand

Commit Message

Jan Kiszka Nov. 24, 2025, 4:39 p.m. UTC
From: Jan Kiszka <jan.kiszka@siemens.com>

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

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

Comments

Jan Kiszka Nov. 24, 2025, 5:05 p.m. UTC | #1
On 24.11.25 17:39, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> The docker command comes with docker-cli from trixie onward.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@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"

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

Patch

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"