From: John Mulligan <jmulligan@redhat.com>
Date: Thu, 28 Aug 2025 23:39:06 +0000 (-0400)
Subject: build-with-container: ensure npm dir is set up before configure
X-Git-Tag: v20.2.1~11^2~17^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6acdbeb7f1f69df1c3d48a70a8abd87486d1a248;p=ceph.git

build-with-container: ensure npm dir is set up before configure

When the npm cache path option is passed the npm cache dir is passed
to all container `run` commands, ensure the dir has been created
before the first container command (configure) is used.

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

diff --git a/src/script/build-with-container.py b/src/script/build-with-container.py
index cbfe1aea8b39..ef41fb9573d4 100755
--- a/src/script/build-with-container.py
+++ b/src/script/build-with-container.py
@@ -648,6 +648,7 @@ def get_container(ctx):
 def bc_configure(ctx):
     """Configure the build"""
     ctx.build.wants(Steps.CONTAINER, ctx)
+    ctx.build.wants(Steps.NPM_CACHE, ctx)
     cmd = _container_cmd(
         ctx,
         [