diff --git a/allinone/Dockerfile b/allinone/Dockerfile index d522fce7..a979601e 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 \ @@ -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 b942bd15..b23a2ba1 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 \ @@ -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/ 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}