Merge pull request #232 from jumpserver/dev

perf: 优化 applets 应用

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"]

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

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
 

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:

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:

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" ]