From 5f9ccc5ce919670f6b77947df36b9aa661b2e155 Mon Sep 17 00:00:00 2001
From: jingrow <support@jingrow.com>
Date: Fri, 22 Aug 2025 06:22:18 +0800
Subject: [PATCH] =?UTF-8?q?Dockerfile=E4=BC=98=E5=8C=96install=20bench?=
 =?UTF-8?q?=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jcloud/docker/Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jcloud/docker/Dockerfile b/jcloud/docker/Dockerfile
index b66cd88..579b0f0 100644
--- a/jcloud/docker/Dockerfile
+++ b/jcloud/docker/Dockerfile
@@ -195,7 +195,10 @@ RUN python${PYTHON_VERSION} -m pip config set global.trusted-host pypi.tuna.tsin
 ENV {{ pg.get_dependency_version("bench", True) }}
 
 # Now bench install command can use the environment variables
-RUN --mount=type=cache,target=/home/jingrow/.cache,uid=1000,gid=1000 python${PYTHON_VERSION} -m pip install --upgrade --resume-retries 5 --timeout 100 git+http://git.jingrow.com/jingrow/bench.git || python${PYTHON_VERSION} -m pip install --upgrade --resume-retries 5 --timeout 100 git+http://$GIT_USERNAME:$GIT_ACCESS_TOKEN@git.jingrow.com/jingrow/bench.git `#stage-bench-bench`
+RUN --mount=type=cache,target=/home/jingrow/.cache,uid=1000,gid=1000 \
+    python${PYTHON_VERSION} -m pip install --upgrade --resume-retries 5 --timeout 100 \
+    git+http://${GIT_USERNAME:+$GIT_USERNAME:$GIT_ACCESS_TOKEN@}git.jingrow.com/jingrow/bench.git \
+    `#stage-bench-bench`
 RUN --mount=type=cache,target=/home/jingrow/.cache,uid=1000,gid=1000 python${PYTHON_VERSION} -m pip install Jinja2~=3.0.3
 RUN --mount=type=cache,target=/home/jingrow/.cache,uid=1000,gid=1000 python${PYTHON_VERSION} -m pip install --upgrade setuptools