Merge pull request #27309 from ygalblum/quadlet-build-ignorefile

Quadlet build - add support for IgnoreFile key

Author: openshift-merge-bot[bot]

docs/source/markdown/podman-systemd.unit.5.md

@@ -1725,6 +1725,7 @@ Valid options for `[Build]` are listed below:
 | ForceRM=false                       | --force-rm=false                            |
 | GlobalArgs=--log-level=debug        | --log-level=debug                           |
 | GroupAdd=keep-groups                | --group-add=keep-groups                     |
+| IgnoreFile=/path/to/.customignore   | --ignorefile=/path/to/.customignore         |
 | ImageTag=localhost/imagename        | --tag=localhost/imagename                   |
 | Label=label                         | --label=label                               |
 | Network=host                        | --network=host                              |
@@ -1840,6 +1841,13 @@ Assign additional groups to the primary user running within the container proces
 
 This is equivalent to the `--group-add` option of `podman build`.
 
+### `IgnoreFile=`
+
+Path to an alternate .containerignore file to use when building the image.
+Note that when using a relative path you should also set `SetWorkingDirectory=`
+
+This is equivalent to the `--ignorefile` option of `podman build`.
+
 ### `ImageTag=`
 
 Specifies the name which is assigned to the resulting image if the build process completes

pkg/systemd/quadlet/quadlet.go

@@ -114,6 +114,7 @@ const (
 	KeyHealthTimeout         = "HealthTimeout"
 	KeyHostName              = "HostName"
 	KeyHttpProxy             = "HttpProxy"
+	KeyIgnoreFile            = "IgnoreFile"
 	KeyImage                 = "Image"
 	KeyImageTag              = "ImageTag"
 	KeyInterfaceName         = "InterfaceName"
@@ -448,6 +449,7 @@ var (
 				KeyForceRM:              true,
 				KeyGlobalArgs:           true,
 				KeyGroupAdd:             true,
+				KeyIgnoreFile:           true,
 				KeyImageTag:             true,
 				KeyLabel:                true,
 				KeyNetwork:              true,
@@ -1394,6 +1396,7 @@ func ConvertBuild(build *parser.UnitFile, unitsInfoMap map[string]*UnitInfo, isU
 	stringKeys := map[string]string{
 		KeyArch:       "--arch",
 		KeyAuthFile:   "--authfile",
+		KeyIgnoreFile: "--ignorefile",
 		KeyTarget:     "--target",
 		KeyVariant:    "--variant",
 		KeyRetry:      "--retry",

test/e2e/quadlet/ignorefile.build

@@ -0,0 +1,6 @@
+## assert-podman-args "--ignorefile" "/path/to/.customignore"
+
+[Build]
+ImageTag=localhost/imagename
+SetWorkingDirectory=unit
+IgnoreFile=/path/to/.customignore

test/e2e/quadlet_test.go

@@ -1056,6 +1056,7 @@ BOGUS=foo
 		Entry("Build - ForceRM Key", "force-rm.build"),
 		Entry("Build - GlobalArgs", "globalargs.build"),
 		Entry("Build - GroupAdd Key", "group-add.build"),
+		Entry("Build - IgnoreFile Key", "ignorefile.build"),
 		Entry("Build - Containers Conf Modules", "containersconfmodule.build"),
 		Entry("Build - Label Key", "label.build"),
 		Entry("Build - Multiple Tags", "multiple-tags.build"),