Merge pull request containers#18788 from ygalblum/quadlet-pull

Quadlet - add support for Pull key in .container
rhatdan · Jun 5, 2023 · d669d94 · d669d94
2 parents e143a0f + 6611735
commit d669d94
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/docs/source/markdown/podman-systemd.unit.5.md b/docs/source/markdown/podman-systemd.unit.5.md
@@ -121,6 +121,7 @@ Valid options for `[Container]` are listed below:
 | Notify=true                    | --sdnotify container                                 |
 | PodmanArgs=--add-host foobar   | --add-host foobar                                    |
 | PublishPort=true               | --publish                                            |
+| Pull=never                     | --pull=never                                         |
 | ReadOnly=true                  | --read-only                                          |
 | RunInit=true                   | --init                                               |
 | SeccompProfile=/tmp/s.json     | --security-opt seccomp=/tmp/s.json                   |
@@ -283,8 +284,7 @@ Equivalent to the Podman `--hostname` option.
 
 ### `Image=`
 
-The image to run in the container. This image must be locally installed for the service to work
-when it is activated, because the generated service file never tries to download images.
+The image to run in the container.
 It is recommended to use a fully qualified image name rather than a short name, both for
 performance and robustness reasons.
 
@@ -391,6 +391,11 @@ allocated port can be found with the `podman port` command.
 
 This key can be listed multiple times.
 
+### `Pull=`
+
+Set the image pull policy.
+This is equivalent to the Podman `--pull` option
+
 ### `ReadOnly=` (defaults to `no`)
 
 If enabled, makes image read-only, with /var/tmp, /tmp and /run a tmpfs (unless disabled by `VolatileTmp=no`).r

diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go
@@ -81,6 +81,7 @@ const (
 	KeyOptions               = "Options"
 	KeyPodmanArgs            = "PodmanArgs"
 	KeyPublishPort           = "PublishPort"
+	KeyPull                  = "Pull"
 	KeyReadOnly              = "ReadOnly"
 	KeyRemapGID              = "RemapGid"
 	KeyRemapUID              = "RemapUid"
@@ -143,6 +144,7 @@ var (
 		KeyNotify:                true,
 		KeyPodmanArgs:            true,
 		KeyPublishPort:           true,
+		KeyPull:                  true,
 		KeyReadOnly:              true,
 		KeyRemapGID:              true,
 		KeyRemapUID:              true,
@@ -625,6 +627,11 @@ func ConvertContainer(container *parser.UnitFile, isUser bool) (*parser.UnitFile
 		podman.add("--hostname", hostname)
 	}
 
+	pull, ok := container.Lookup(ContainerGroup, KeyPull)
+	if ok && len(pull) > 0 {
+		podman.add("--pull", pull)
+	}
+
 	handlePodmanArgs(container, ContainerGroup, podman)
 
 	if len(image) > 0 {

diff --git a/test/e2e/quadlet/pull.container b/test/e2e/quadlet/pull.container
@@ -0,0 +1,6 @@
+## assert-podman-final-args localhost/imagename
+## assert-podman-args --pull never
+
+[Container]
+Image=localhost/imagename
+Pull=never
diff --git a/test/e2e/quadlet_test.go b/test/e2e/quadlet_test.go
@@ -578,6 +578,7 @@ var _ = Describe("quadlet system generator", func() {
 		Entry("mount.container", "mount.container"),
 		Entry("health.container", "health.container"),
 		Entry("hostname.container", "hostname.container"),
+		Entry("pull.container", "pull.container"),
 
 		Entry("basic.volume", "basic.volume"),
 		Entry("label.volume", "label.volume"),