From f0ed5a548076b01505d5e33e71266cb34ab5f03a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Fri, 17 Nov 2023 10:36:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?perf:=20core=20=E9=95=9C=E5=83=8F=E6=8B=86?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 allinone/Dockerfile        | 2 +-
 core/Dockerfile            | 2 +-
 docker-compose-build.yml   | 2 +-
 docker-compose-init-db.yml | 2 +-
 docker-compose-xpack.yml   | 5 +++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/allinone/Dockerfile b/allinone/Dockerfile
index d522fce7..b373e7fb 100644
--- a/allinone/Dockerfile
+++ b/allinone/Dockerfile
@@ -96,7 +96,7 @@ RUN set -ex \
         rustArch="${TARGETARCH}"; \
         mkdir -p /opt/rust-install; \
         if [ "${TARGETARCH}" == "loong64" ]; then \
-            rustUrl="https://rust-lang.loongnix.cn/dist/${RUST_VERSION}/2023-08-10"; \
+            rustUrl="download.jumpserver.org/rust/dist"; \
             rustArch="loongarch64"; \
         fi; \
         if [ "${TARGETARCH}" == "ppc64le" ]; then \
diff --git a/core/Dockerfile b/core/Dockerfile
index b942bd15..5cae3438 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -92,7 +92,7 @@ RUN set -ex \
         rustArch="${TARGETARCH}"; \
         mkdir -p /opt/rust-install; \
         if [ "${TARGETARCH}" == "loong64" ]; then \
-            rustUrl="https://rust-lang.loongnix.cn/dist/${RUST_VERSION}/2023-08-10"; \
+            rustUrl="download.jumpserver.org/rust/dist"; \
             rustArch="loongarch64"; \
         fi; \
         if [ "${TARGETARCH}" == "ppc64le" ]; then \
diff --git a/docker-compose-build.yml b/docker-compose-build.yml
index 6ef19499..6ea045b6 100644
--- a/docker-compose-build.yml
+++ b/docker-compose-build.yml
@@ -7,7 +7,7 @@ services:
       args:
         VERSION: ${VERSION}
         TARGETARCH: ${TARGETARCH}
-    image: jumpserver/core:${VERSION}
+    image: jumpserver/core-ce:${VERSION}
     container_name: jms_core
     restart: always
     tty: true
diff --git a/docker-compose-init-db.yml b/docker-compose-init-db.yml
index c427bd8b..bdefa0c1 100644
--- a/docker-compose-init-db.yml
+++ b/docker-compose-init-db.yml
@@ -2,7 +2,7 @@ version: '2.4'
 
 services:
   core:
-    image: jumpserver/core:${VERSION}
+    image: jumpserver/core-ce:${VERSION}
     container_name: jms_core
     tty: true
     command: sleep
diff --git a/docker-compose-xpack.yml b/docker-compose-xpack.yml
index f1964a80..7ccebd4f 100644
--- a/docker-compose-xpack.yml
+++ b/docker-compose-xpack.yml
@@ -2,10 +2,10 @@ version: '2.4'
 
 services:
   core:
-    image: registry.fit2cloud.com/jumpserver/core:${VERSION}
+    image: registry.fit2cloud.com/jumpserver/core-ee:${VERSION}
 
   celery:
-    image: registry.fit2cloud.com/jumpserver/core:${VERSION}
+    image: registry.fit2cloud.com/jumpserver/core-ee:${VERSION}
 
   koko:
     image: registry.fit2cloud.com/jumpserver/koko:${VERSION}
@@ -18,6 +18,7 @@ services:
     ports:
       - ${MAGNUS_POSTGRESQL_PORT:-54320}:54320
       - ${MAGNUS_ORACLE_PORTS:-30000-30030}:${MAGNUS_ORACLE_PORTS:-30000-30030}
+
   chen:
     image: registry.fit2cloud.com/jumpserver/chen:${VERSION}
 

From c34ffe504d401c2301052271db219e829f7a9c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Fri, 17 Nov 2023 10:57:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=20rust=20?=
 =?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 allinone/Dockerfile | 2 ++
 core/Dockerfile     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/allinone/Dockerfile b/allinone/Dockerfile
index b373e7fb..a979601e 100644
--- a/allinone/Dockerfile
+++ b/allinone/Dockerfile
@@ -106,6 +106,8 @@ RUN set -ex \
         tar -xf /opt/rust.tar.gz -C /opt/rust-install --strip-components=1; \
         cd /opt/rust-install && ./install.sh; \
         cd /opt && rm -rf /opt/rust-install /opt/rust.tar.gz; \
+        mkdir -p ${CARGO_HOME:-$HOME/.cargo}; \
+        echo -e '[source.crates-io]\nreplace-with = "ustc"\n\n[source.ustc]\nregistry = "sparse+https://mirrors.ustc.edu.cn/crates.io-index/"' > ${CARGO_HOME:-$HOME/.cargo}/config; \
     fi
 
 COPY --from=get-core /opt/jumpserver/poetry.lock /opt/jumpserver/pyproject.toml /opt/jumpserver/
diff --git a/core/Dockerfile b/core/Dockerfile
index 5cae3438..b23a2ba1 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -102,6 +102,8 @@ RUN set -ex \
         tar -xf /opt/rust.tar.gz -C /opt/rust-install --strip-components=1; \
         cd /opt/rust-install && ./install.sh; \
         cd /opt && rm -rf /opt/rust-install /opt/rust.tar.gz; \
+        mkdir -p ${CARGO_HOME:-$HOME/.cargo}; \
+        echo -e '[source.crates-io]\nreplace-with = "ustc"\n\n[source.ustc]\nregistry = "sparse+https://mirrors.ustc.edu.cn/crates.io-index/"' > ${CARGO_HOME:-$HOME/.cargo}/config; \
     fi
 
 COPY --from=stage-1 /opt/jumpserver/poetry.lock /opt/jumpserver/pyproject.toml /opt/jumpserver/