]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
script/build-with-container: fix building on docker
authorJohn Mulligan <jmulligan@redhat.com>
Fri, 14 Mar 2025 18:39:09 +0000 (14:39 -0400)
committerDavid Galloway <david.galloway@ibm.com>
Thu, 31 Jul 2025 21:14:53 +0000 (17:14 -0400)
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)

src/script/build-with-container.py

index 761d190b26d308e4fe55b0d73e12318f401aad6f..aded2a7de33cc1e2797807f718faa662b08010ea 100755 (executable)
@@ -468,7 +468,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}",