Drop the FGC namespace from the fedora-toolbox images

The FGC namespace used to be required by the Fedora container guidelines, but not anymore [1]. [1] https://pagure.io/ContainerSIG/container-sig/issue/2 containers#615
HarryMichal · Feb 12, 2021 · d575318 · d575318
1 parent b27795a
commit d575318
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/images/fedora/f32/Dockerfile b/images/fedora/f32/Dockerfile
@@ -4,7 +4,7 @@ ENV NAME=fedora-toolbox VERSION=32
 LABEL com.github.containers.toolbox="true" \
       com.github.debarshiray.toolbox="true" \
       com.redhat.component="$NAME" \
-      name="$FGC/$NAME" \
+      name="$NAME" \
       version="$VERSION" \
       usage="This image is meant to be used with the toolbox command" \
       summary="Base image for creating Fedora toolbox containers" \

diff --git a/images/fedora/f33/Dockerfile b/images/fedora/f33/Dockerfile
@@ -4,7 +4,7 @@ ENV NAME=fedora-toolbox VERSION=33
 LABEL com.github.containers.toolbox="true" \
       com.github.debarshiray.toolbox="true" \
       com.redhat.component="$NAME" \
-      name="$FGC/$NAME" \
+      name="$NAME" \
       version="$VERSION" \
       usage="This image is meant to be used with the toolbox command" \
       summary="Base image for creating Fedora toolbox containers" \

diff --git a/images/fedora/f34/Dockerfile b/images/fedora/f34/Dockerfile
@@ -4,7 +4,7 @@ ENV NAME=fedora-toolbox VERSION=34
 LABEL com.github.containers.toolbox="true" \
       com.github.debarshiray.toolbox="true" \
       com.redhat.component="$NAME" \
-      name="$FGC/$NAME" \
+      name="$NAME" \
       version="$VERSION" \
       usage="This image is meant to be used with the toolbox command" \
       summary="Base image for creating Fedora toolbox containers" \

diff --git a/src/pkg/utils/utils.go b/src/pkg/utils/utils.go
@@ -98,8 +98,8 @@ var (
 			"fedora-toolbox",
 			parseReleaseFedora,
 			"registry.fedoraproject.org",
-			"f%s",
-			true,
+			"",
+			false,
 		},
 		"rhel": {
 			"rhel-toolbox",
@@ -345,7 +345,13 @@ func GetFullyQualifiedImageFromDistros(image, release string) (string, error) {
 			repository = distroObj.Repository
 		}
 
-		imageFull := distroObj.Registry + "/" + repository + "/" + image
+		imageFull := distroObj.Registry
+
+		if repository != "" {
+			imageFull = imageFull + "/" + repository
+		}
+
+		imageFull = imageFull + "/" + image
 
 		logrus.Debugf("Resolved image %s to %s", image, imageFull)