Skip to content

Commit 6cbf885

Browse files
committed
Merge remote-tracking branch 'upstream/staging' into v5.x
* upstream/staging: fix(uv): set link-mode=copy for FC docker builds Signed-off-by: Akhil Narang <[email protected]>
2 parents 58a8957 + 4bfc164 commit 6cbf885

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

bench/bench.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,10 @@ def env(self, python="python3"):
365365

366366
if not os.path.exists(self.bench.python):
367367
if os.environ.get("BENCH_USE_UV"):
368-
self.run("uv venv env --seed", cwd=self.bench.name)
368+
if os.environ.get("FRAPPE_DOCKER_BUILD"):
369+
self.run("uv venv env --seed --link-mode=copy", cwd=self.bench.name)
370+
else:
371+
self.run("uv venv env --seed", cwd=self.bench.name)
369372
else:
370373
venv = get_venv_path(verbose=verbose, python=python)
371374
self.run(f"{venv} env", cwd=self.bench.name)

bench/utils/bench.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,10 @@ def _install_app(app, pyenv):
256256
try:
257257
logger.log(f"Setting up a New Virtual {python} Environment")
258258
if os.environ.get("BENCH_USE_UV"):
259-
exec_cmd(f"uv venv {pvenv} --seed")
259+
if os.environ.get("FRAPPE_DOCKER_BUILD"):
260+
exec_cmd(f"uv venv {pvenv} --seed --link-mode=copy", cwd=self.bench.name)
261+
else:
262+
exec_cmd(f"uv venv {pvenv} --seed", cwd=self.bench.name)
260263
else:
261264
exec_cmd(f"{python} -m venv {pvenv}")
262265

0 commit comments

Comments
 (0)