script/build-with-container: support --build-arg arguments

Allow passing --build-arg arguments to build-with-container.py
which are passed directly to the container build command.
This allows a developer to toggle certain features of the build
container, however this should not be used in CI.

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

diff --git a/src/script/build-with-container.py b/src/script/build-with-container.py
index 3b519fe63da1e76412851c1fc95a9c72067e478a..4dd35517f3e75b1eb99346dbacac4134f3ca8ddc 100755 (executable)
--- a/src/script/build-with-container.py
+++ b/src/script/build-with-container.py
@@ -553,6 +553,8 @@ def build_container(ctx):
             f"--volume={ctx.dnf_cache_dir}:/var/cache/dnf:Z",
             "--build-arg=CLEAN_DNF=no",
         ]
+    if ctx.cli.build_args:
+        cmd.extend([f"--build-arg={v}" for v in ctx.cli.build_args])
     cmd += ["-f", ctx.cli.containerfile, ctx.cli.containerdir]
     with ctx.user_command():
         _run(cmd, check=True, ctx=ctx)
@@ -935,6 +937,15 @@ def parse_cli(build_step_names):
             " (the ceph source root)"
         ),
     )
+    parser.add_argument(
+        "--build-arg",
+        dest="build_args",
+        action="append",
+        help=(
+            "Extra argument to pass to container image build."
+            " Can be used to override default build image behavior."
+        ),
+    )
     parser.add_argument(
         "--overlay-dir",
         "-l",