From b34ab8b5fa2607ff28582243a75b2e9c14a7403f Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Fri, 2 Dec 2022 16:33:09 +0100 Subject: [PATCH] quadlet: Drop --pull=never This is to match podman run default behaviour. Signed-off-by: Alexander Larsson --- pkg/systemd/quadlet/quadlet.go | 4 +--- test/e2e/quadlet/basepodman.container | 2 +- test/e2e/quadlet/basic.container | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go index 8ba00a88dd..2268c755b4 100644 --- a/pkg/systemd/quadlet/quadlet.go +++ b/pkg/systemd/quadlet/quadlet.go @@ -253,9 +253,7 @@ func ConvertContainer(container *parser.UnitFile, isUser bool) (*parser.UnitFile // But we still want output to the journal, so use the log driver. "--log-driver", "passthrough", - - // Never try to pull the image during service start - "--pull=never") + ) // We use crun as the runtime and delegated groups to it service.Add(ServiceGroup, "Delegate", "yes") diff --git a/test/e2e/quadlet/basepodman.container b/test/e2e/quadlet/basepodman.container index 5ac5b962a8..6c6de8abb5 100644 --- a/test/e2e/quadlet/basepodman.container +++ b/test/e2e/quadlet/basepodman.container @@ -1,4 +1,4 @@ -## assert-podman-final-args run --name=systemd-%N --cidfile=%t/%N.cid --replace --rm -d --log-driver passthrough --pull=never --runtime /usr/bin/crun --cgroups=split --sdnotify=conmon localhost/imagename +## assert-podman-final-args run --name=systemd-%N --cidfile=%t/%N.cid --replace --rm -d --log-driver passthrough --runtime /usr/bin/crun --cgroups=split --sdnotify=conmon localhost/imagename [Container] Image=localhost/imagename diff --git a/test/e2e/quadlet/basic.container b/test/e2e/quadlet/basic.container index 78372f27bc..4d248c2a6f 100644 --- a/test/e2e/quadlet/basic.container +++ b/test/e2e/quadlet/basic.container @@ -5,7 +5,6 @@ ## assert-podman-args "--replace" ## assert-podman-args "-d" ## assert-podman-args "--log-driver" "passthrough" -## assert-podman-args "--pull=never" ## assert-podman-args "--runtime" "/usr/bin/crun" ## assert-podman-args "--cgroups=split" ## assert-podman-args "--sdnotify=conmon"