Merge branch 'dev' into pr@dev@fix_sessioni18n

jumpserver · Jul 24, 2024 · 959e351 · 959e351
2 parents 474e368 + ef99e25
commit 959e351
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/jms-build-test.yml b/.github/workflows/jms-build-test.yml
@@ -24,7 +24,6 @@ jobs:
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
-        if: env.GITHUB_REPOSITORY_VISIBILITY == 'public'
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM jumpserver/lina-base:20240723_112141 AS stage-build
+FROM jumpserver/lina-base:20240723_084702 AS stage-build
 
 ARG VERSION
 ENV VERSION=$VERSION

diff --git a/Dockerfile-base b/Dockerfile-base
@@ -16,5 +16,7 @@ WORKDIR /data
 
 COPY package.json yarn.lock ./
 
+ARG NPM_MIRROR="https://registry.npmjs.org"
 RUN --mount=type=cache,target=/usr/local/share/.cache/yarn,sharing=locked,id=yarn-cache \
-    yarn install
+    sed -i "s|https://registry.npmmirror.com|${NPM_MIRROR}|g" yarn.lock \
+    && yarn install