From: John Mulligan <jmulligan@redhat.com>
Date: Fri, 14 Mar 2025 18:39:09 +0000 (-0400)
Subject: script/build-with-container: fix building on docker
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4a29dd08ddeb98a6e69c186805d7bcceddaf0b31;p=ceph.git

script/build-with-container: fix building on docker

Fix building images on docker by using the `--pull` option instead of
`--pull=always`. The latter apparently only works on podman. The former
should do the same thing on both container engines.

Fixes: https://tracker.ceph.com/issues/70470
Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit bc80c5fde5944f04a31d3f9f29db145b05214ab3)
---

diff --git a/src/script/build-with-container.py b/src/script/build-with-container.py
index 54178e3acf7..28f7a2c6580 100755
--- a/src/script/build-with-container.py
+++ b/src/script/build-with-container.py
@@ -474,7 +474,7 @@ def build_container(ctx):
     cmd = [
         ctx.container_engine,
         "build",
-        "--pull=always",
+        "--pull",
         "-t",
         ctx.image_name,
         f"--build-arg=JENKINS_HOME={ctx.cli.homedir}",