From 3431374dcba0841b666736ebabccaf14ec27afa9 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Oct 10 2023 15:58:56 +0000 Subject: Toolbx: Make 'toolbox list --images', etc. recognize the image The toolbox(1) command identifies Toolbx images, as opposed to any random OCI image, by checking whether the com.github.containers.toolbox label matches "true". Otherwise, the image doesn't get displayed in 'toolbox list --images', can't be deleted with 'toolbox rmi', etc.. https://bugzilla.redhat.com/show_bug.cgi?id=2242874 https://pagure.io/pungi-fedora/pull-request/1199 Signed-off-by: Debarshi Ray --- diff --git a/fedora-container.conf b/fedora-container.conf index 058ca77..1cd7e43 100644 --- a/fedora-container.conf +++ b/fedora-container.conf @@ -205,7 +205,7 @@ image_build = { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', 'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40", "com.github.containers.toolbox": "true"}', }, } ], diff --git a/fedora.conf b/fedora.conf index 268dc07..8bc71bc 100644 --- a/fedora.conf +++ b/fedora.conf @@ -262,7 +262,7 @@ image_build = { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', 'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40", "com.github.containers.toolbox": "true"}', }, } ],