PR#1247: [f40] Toolbx: Fix the 'name' label - pungi-fedora

pungi-fedora

#1247 [f40] Toolbx: Fix the 'name' label

Opened 2 months ago by rishi. Modified 2 months ago

rishi/pungi-fedora wip/rishi/name-fedora-toolbox-f40 into f40

Debarshi Ray • 2 months ago

a2653d4

fedora-container.conf

file modified

+1 -1

		`@@ -205,7 +205,7 @@`
		`'dockerversion': "1.10.1",`
		`'docker_cmd': '[ "/bin/bash" ]',`
		`'docker_env': '[ "container=oci" ]',`
		`- 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40", "com.github.containers.toolbox": "true"}',`
		`+ 'docker_label': '{ "name": "fedora-toolbox", "license": "MIT", "vendor": "Fedora Project", "version": "40", "com.github.containers.toolbox": "true"}',`
		`},`
		`}`
		`],`

fedora.conf

file modified

+1 -1

		`@@ -262,7 +262,7 @@`
		`'dockerversion': "1.10.1",`
		`'docker_cmd': '[ "/bin/bash" ]',`
		`'docker_env': '[ "container=oci" ]',`
		`- 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40", "com.github.containers.toolbox": "true"}',`
		`+ 'docker_label': '{ "name": "fedora-toolbox", "license": "MIT", "vendor": "Fedora Project", "version": "40", "com.github.containers.toolbox": "true"}',`
		`},`
		`}`
		`],`

rishi commented 2 months ago

The Container/Dockerfile equivalent of the fedora-toolbox OCI images had
the name label set to fedora-toolbox, not fedora.

Compare this:

  $ podman inspect \
      --format '{{ .Labels.name }}' \
      --type image registry.fedoraproject.org/fedora-toolbox:38
  fedora-toolbox

... with:

  $ podman inspect \
      --format '{{ .Labels.name }}' \
      --type image registry.fedoraproject.org/fedora-toolbox:39
  fedora
  $ podman inspect \
      --format '{{ .Labels.name }}' \
      --type image registry.fedoraproject.org/fedora-toolbox:40
  fedora

The name label doesn't really matter today, which is why it went
unnoticed during the Fedora 39 development cycle. However, it would be
good to fix it, in case someone or something starts using it.

Signed-off-by: Debarshi Ray rishi@fedoraproject.org

rebased onto a2653d4

2 months ago

rishi commented 2 months ago

This can land after the Beta Freeze.

rishi commented 2 months ago

Corresponding pull request for main: https://pagure.io/pungi-fedora/pull-request/1246

ngompa commented 2 months ago

This is now fixed in the kiwi descriptions: https://pagure.io/fedora-kiwi-descriptions/c/40a69d3fd77eeefcd456ee08db66fe5e595487b7

rishi commented 2 months ago

It looks like the images that I just pulled are still built by Image Factory:

$ podman inspect \
    --format '{{ .Comment }}' \
    --type image \
    registry.fedoraproject.org/fedora-toolbox:41
Created by Image Factory
$ podman inspect \
    --format '{{ .Comment }}' \
    --type image \
    registry.fedoraproject.org/fedora-toolbox:40
Created by Image Factory