opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-02 19:28:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Quadlet - Support multiple image tags in .build files

Browse Source 
Signed-off-by: Ygal Blum <ygal.blum@gmail.com>
This commit is contained in:
Ygal Blum
2024-08-29 15:07:49 -04:00
parent 2b3052eac3
commit 2b14db2af3
5 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/markdown/podman-systemd.unit.5.md
View File

@@ -1621,6 +1621,8 @@ successfully.
This is equivalent to the `--tag` option of `podman build`. This is equivalent to the `--tag` option of `podman build`.
This key can be listed multiple times. The first instance will be used as the name of the created artifact when the `.build` file is referenced by another Quadlet unit.
### `Label=` ### `Label=`
Add an image *label* (e.g. label=*value*) to the image metadata. Can be used multiple times. Add an image *label* (e.g. label=*value*) to the image metadata. Can be used multiple times.

10
pkg/systemd/quadlet/quadlet.go
View File

@@ -1494,7 +1494,10 @@ func ConvertBuild(build *parser.UnitFile, unitsInfoMap map[string]*UnitInfo) (*p
labels := build.LookupAllKeyVal(BuildGroup, KeyLabel) labels := build.LookupAllKeyVal(BuildGroup, KeyLabel)
podman.addLabels(labels) podman.addLabels(labels)
podman.addf("--tag=%s", unitInfo.ResourceName) imageTags := build.LookupAll(BuildGroup, KeyImageTag)
for _, imageTag := range imageTags {
podman.addf("--tag=%s", imageTag)
}
if err := addNetworks(build, BuildGroup, service, unitsInfoMap, podman); err != nil { if err := addNetworks(build, BuildGroup, service, unitsInfoMap, podman); err != nil {
return nil, err return nil, err
@@ -1555,8 +1558,9 @@ func ConvertBuild(build *parser.UnitFile, unitsInfoMap map[string]*UnitInfo) (*p
} }
func GetBuiltImageName(buildUnit *parser.UnitFile) string { func GetBuiltImageName(buildUnit *parser.UnitFile) string {
if builtImageName, ok := buildUnit.Lookup(BuildGroup, KeyImageTag); ok { imageTags := buildUnit.LookupAll(BuildGroup, KeyImageTag)
return builtImageName if len(imageTags) > 0 {
return imageTags[0]
} }
return "" return ""
} }

4
test/e2e/quadlet/build.multiple-tags.container Normal file
View File

@@ -0,0 +1,4 @@
## assert-podman-final-args localhost/imagename:v1
[Container]
Image=multiple-tags.build

7
test/e2e/quadlet/multiple-tags.build Normal file
View File

@@ -0,0 +1,7 @@
## assert-podman-args --tag=localhost/imagename:v1
## assert-podman-args --tag=localhost/imagename:latest
[Build]
ImageTag=localhost/imagename:v1
ImageTag=localhost/imagename:latest
SetWorkingDirectory=unit

2
test/e2e/quadlet_test.go
View File

@@ -984,6 +984,7 @@ BOGUS=foo
Entry("Build - GroupAdd Key", "group-add.build"), Entry("Build - GroupAdd Key", "group-add.build"),
Entry("Build - Containers Conf Modules", "containersconfmodule.build"), Entry("Build - Containers Conf Modules", "containersconfmodule.build"),
Entry("Build - Label Key", "label.build"), Entry("Build - Label Key", "label.build"),
Entry("Build - Multiple Tags", "multiple-tags.build"),
Entry("Build - Network Key host", "network.build"), Entry("Build - Network Key host", "network.build"),
Entry("Build - PodmanArgs", "podmanargs.build"), Entry("Build - PodmanArgs", "podmanargs.build"),
Entry("Build - Pull Key", "pull.build"), Entry("Build - Pull Key", "pull.build"),
@@ -1075,6 +1076,7 @@ BOGUS=foo
Entry("Container - Mount overriding service name", "mount.servicename.container", []string{"service-name.volume"}), Entry("Container - Mount overriding service name", "mount.servicename.container", []string{"service-name.volume"}),
Entry("Container - Quadlet Network overriding service name", "network.quadlet.servicename.container", []string{"service-name.network"}), Entry("Container - Quadlet Network overriding service name", "network.quadlet.servicename.container", []string{"service-name.network"}),
Entry("Container - Quadlet Volume overriding service name", "volume.servicename.container", []string{"service-name.volume"}), Entry("Container - Quadlet Volume overriding service name", "volume.servicename.container", []string{"service-name.volume"}),
Entry("Container - Quadlet build with multiple tags", "build.multiple-tags.container", []string{"multiple-tags.build"}),
Entry("Volume - Quadlet image (.build)", "build.quadlet.volume", []string{"basic.build"}), Entry("Volume - Quadlet image (.build)", "build.quadlet.volume", []string{"basic.build"}),
Entry("Volume - Quadlet image (.image)", "image.quadlet.volume", []string{"basic.image"}), Entry("Volume - Quadlet image (.image)", "image.quadlet.volume", []string{"basic.image"}),