From 2f1be462b3870d3c65fcbdff4ad6d2ad02464c82 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, 26 Apr 2024 10:23:26 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20applets=20?= =?UTF-8?q?=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- allinone/Dockerfile | 9 +++++++++ allinone/README.md | 7 +++++-- allinone/docker-compose.yml | 3 ++- docker-compose-build.yml | 3 ++- docker-compose.yml | 3 ++- web/Dockerfile | 11 ++++++++++- 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/allinone/Dockerfile b/allinone/Dockerfile index dfeffc8..e6e4ef7 100644 --- a/allinone/Dockerfile +++ b/allinone/Dockerfile @@ -145,11 +145,20 @@ RUN chmod +x ./entrypoint.sh ENV TERMINAL_MAGNUS_ENABLED=False \ TERMINAL_KOKO_SSH_ENABLED=False +RUN set -ex \ + && STATIC_VERSION=$(curl -s https://raw.githubusercontent.com/jumpserver/web-static/master/VERSION) \ + && wget -O /opt/prepare.sh https://github.com/jumpserver/web-static/raw/${STATIC_VERSION}/prepare.sh \ + && chown root:root /opt/prepare.sh \ + && chmod 755 /opt/prepare.sh \ + && sed -i "s@https://gitea.com/jumpserver/web-static/raw/tag/.*/download/@https://gitea.com/jumpserver/web-static/raw/tag/${STATIC_VERSION}/download/@g" /etc/nginx/nginx.conf + VOLUME /opt/jumpserver/data VOLUME /opt/koko/data VOLUME /opt/lion/data VOLUME /opt/kael/data VOLUME /opt/chen/data +VOLUME /opt/download +VOLUME /var/log/nginx EXPOSE 80 2222 ENTRYPOINT ["./entrypoint.sh"] \ No newline at end of file diff --git a/allinone/README.md b/allinone/README.md index 0cb90d7..272ca49 100644 --- a/allinone/README.md +++ b/allinone/README.md @@ -61,6 +61,7 @@ flush privileges; - VOLUME /opt/kael/data # Kael 持久化目录 - VOLUME /opt/chen/data # Chen 持久化目录 - VOLUME /var/log/nginx # Nginx 日志持久化目录 + - VOLUME /opt/download # APPLETS 文件持久化目录 (应用发布机所需文件) 注意：自己上面设置的这些信息一定要记录下来，升级需要重新输入使用。 @@ -90,7 +91,8 @@ docker run --name jms_all -d \ -v /opt/jumpserver/lion/data:/opt/lion/data \ -v /opt/jumpserver/kael/data:/opt/kael/data \ -v /opt/jumpserver/chen/data:/opt/chen/data \ - -v /opt/jumpserver/web/log:/var/log/nginx \ + -v /opt/jumpserver/web/data/logs:/var/log/nginx \ + -v /opt/jumpserver/web/data/download:/opt/download \ jumpserver/jms_all:v3.10.9 ``` @@ -134,5 +136,6 @@ docker run --name jms_all -d \ -v /opt/jumpserver/lion/data:/opt/lion/data \ -v /opt/jumpserver/kael/data:/opt/kael/data \ -v /opt/jumpserver/chen/data:/opt/chen/data \ - -v /opt/jumpserver/web/log:/var/log/nginx \ + -v /opt/jumpserver/web/data/logs:/var/log/nginx \ + -v /opt/jumpserver/web/data/download:/opt/download \ jumpserver/jms_all:v3.10.9 diff --git a/allinone/docker-compose.yml b/allinone/docker-compose.yml index 1e0e1c8..48cc114 100644 --- a/allinone/docker-compose.yml +++ b/allinone/docker-compose.yml @@ -77,7 +77,8 @@ services: - ${VOLUME_DIR:-./data}/lion/data:/opt/lion/data - ${VOLUME_DIR:-./data}/chen/data:/opt/chen/data - ${VOLUME_DIR:-./data}/kael/data:/opt/kael/data - - ${VOLUME_DIR:-./data}/nginx/data:/var/log/nginx + - ${VOLUME_DIR:-./data}/web/data/logs:/var/log/nginx + - ${VOLUME_DIR:-./data}/web/data/download:/opt/download networks: - net diff --git a/docker-compose-build.yml b/docker-compose-build.yml index 1be17fb..b6c9d4d 100644 --- a/docker-compose-build.yml +++ b/docker-compose-build.yml @@ -269,7 +269,8 @@ services: start_period: 10s volumes: - ${VOLUME_DIR}/core/data:/opt/jumpserver/data - - ${VOLUME_DIR}/nginx/data/logs:/var/log/nginx + - ${VOLUME_DIR}/web/data/logs:/var/log/nginx + - ${VOLUME_DIR}/web/data/download:/opt/download ports: - ${HTTP_PORT:-80}:80 networks: diff --git a/docker-compose.yml b/docker-compose.yml index 8fb2654..9470e6c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -222,7 +222,8 @@ services: start_period: 10s volumes: - ${VOLUME_DIR}/core/data:/opt/jumpserver/data - - ${VOLUME_DIR}/nginx/data/logs:/var/log/nginx + - ${VOLUME_DIR}/web/data/logs:/var/log/nginx + - ${VOLUME_DIR}/web/download:/opt/download ports: - ${HTTP_PORT:-80}:80 networks: diff --git a/web/Dockerfile b/web/Dockerfile index 31c5aca..7d8fbff 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -42,7 +42,8 @@ ENV LANG=en_US.UTF-8 ARG DEPENDENCIES=" \ ca-certificates \ - logrotate" + logrotate \ + wget" RUN set -ex \ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ @@ -60,9 +61,17 @@ COPY web/nginx.conf /etc/nginx/ WORKDIR /opt +RUN set -ex \ + && STATIC_VERSION=$(curl -s https://raw.githubusercontent.com/jumpserver/web-static/master/VERSION) \ + && wget -O /opt/prepare.sh https://github.com/jumpserver/web-static/raw/${STATIC_VERSION}/prepare.sh \ + && chown root:root /opt/prepare.sh \ + && chmod 755 /opt/prepare.sh \ + && sed -i 's@https://gitea.com/jumpserver/web-static/raw/tag/.*/download/@https://gitea.com/jumpserver/web-static/raw/tag/${STATIC_VERSION}/download/@g' /etc/nginx/nginx.conf + ARG VERSION=v3.10.9 ENV VERSION=${VERSION} +VOLUME /opt/download VOLUME /var/log/nginx CMD [ "./entrypoint.sh" ]