From: John Mulligan <jmulligan@redhat.com>
Date: Wed, 19 Feb 2025 18:20:01 +0000 (-0500)
Subject: script/build-with-container.py: build builder image with --pull=always
X-Git-Tag: v18.2.5~23^2~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=915f6210d7e5bb2bd020dc02febaf1eb1afd1798;p=ceph.git

script/build-with-container.py: build builder image with --pull=always

Construct the builder image using the --pull=always flag to initiate a
pull of the base image (centos, ubuntu, etc) in order to avoid using a
stale base image. Since the script automatically (by default) avoids
building if a matching tag is in local container storage it is handy to
use a fresh base when it *is* time to build something. Otherwise, you
end up in a situation like I sometimes do - using a months old base
unintentionally.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit f6e6188e30a9d765e86bd2d710666cfbdeb0818c)
---

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