Merge pull request #209 from jumpserver/dev

feat: 更新 v3.10.1

README.md

@@ -56,7 +56,7 @@ vi .env
 ```
 ```vim
 # 版本号可以自己根据项目的版本修改
-VERSION=v3.10.0
+VERSION=v3.10.1
 
 # 构建参数, 支持 amd64/arm64/loong64
 TARGETARCH=amd64

allinone/Dockerfile

@@ -1,6 +1,6 @@
 FROM jumpserver/redis:7.0-buster as redis
 FROM jumpserver/guacd:1.5.3-buster as guacd
-FROM jumpserver/web-static:v1.0.4 as static
+FROM jumpserver/web-static:v1.0.5 as static
 FROM jumpserver/openjdk:17-slim-buster as openjdk
 FROM jumpserver/python:3.11-slim-buster as get-core
 ARG TARGETARCH
@@ -22,7 +22,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 WORKDIR /opt
 
-ARG VERSION=v3.10.0
+ARG VERSION=v3.10.1
 ENV VERSION=$VERSION
 
 RUN set -ex \
@@ -35,7 +35,7 @@ RUN set -ex \
 WORKDIR /opt/jumpserver
 
 RUN set -ex \
-    && wget -q https://github.com/wojiushixiaobai/jumpserver-patch/raw/${VERSION}/core/Dockerfile-ce \
+    && wget -q https://github.com/wojiushixiaobai/jumpserver-patch/raw/master/core/Dockerfile-ce \
     && cd utils \
     && bash -ixeu build.sh
 
@@ -126,9 +126,10 @@ RUN --mount=type=cache,target=/root/.cache \
 
 FROM jumpserver/python:3.11-slim-buster
 ARG TARGETARCH
-ENV LANG=zh_CN.UTF-8
+ENV LANG=en_US.UTF-8
 
 ARG DEPENDENCIES="                    \
+        freerdp2-dev                  \
         libjpeg-dev                   \
         libx11-dev                    \
         libxmlsec1-openssl"
@@ -139,17 +140,12 @@ ARG TOOLS="                           \
         default-libmysqlclient-dev    \
         default-mysql-client          \
         gnupg2                        \
-        iputils-ping                  \
-        locales                       \
         netcat                        \
         logrotate                     \
         openssh-client                \
         p11-kit                       \
         sshpass                       \
         supervisor                    \
-        telnet                        \
-        vim                           \
-        nmap                          \
         wget"
 
 RUN set -ex \
@@ -160,11 +156,11 @@ RUN set -ex \
     && apt-get -y install --no-install-recommends ${TOOLS} \
     && mkdir -p /root/.ssh/ \
     && echo "Host *\n\tStrictHostKeyChecking no\n\tUserKnownHostsFile /dev/null\n\tCiphers +aes128-cbc\n\tKexAlgorithms +diffie-hellman-group1-sha1\n\tHostKeyAlgorithms +ssh-rsa" > /root/.ssh/config \
-    && echo "set mouse-=a" > ~/.vimrc \
     && echo "no" | dpkg-reconfigure dash \
-    && echo "zh_CN.UTF-8" | dpkg-reconfigure locales \
     && sed -i "s@# export @export @g" ~/.bashrc \
-    && sed -i "s@# alias @alias @g" ~/.bashrc
+    && sed -i "s@# alias @alias @g" ~/.bashrc \
+    && apt-get clean all \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN set -ex \
     && apt-get update \
@@ -186,7 +182,9 @@ RUN set -ex \
             ;; \
     esac \
     && apt-get -y install --no-install-recommends nginx \
-    && mkdir -p /var/cache/nginx
+    && mkdir -p /var/cache/nginx \
+    && apt-get clean all \
+    && rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME /usr/local/openjdk-17
 ENV PATH $JAVA_HOME/bin:$PATH
@@ -286,7 +284,7 @@ COPY --from=build-core /opt/py3 /opt/py3
 COPY --from=get-core /opt/jumpserver/release/jumpserver /opt/jumpserver
 COPY --from=static /opt/download /opt/download
 
-ARG VERSION=v3.10.0
+ARG VERSION=v3.10.1
 ENV VERSION=${VERSION}
 ENV PATH=/opt/py3/bin:$PATH
 

allinone/README.md

@@ -102,7 +102,7 @@ docker run --name jms_all -d \
   -v /opt/jumpserver/kael/data:/opt/kael/data \
   -v /opt/jumpserver/chen/data:/opt/chen/data \
   -v /opt/jumpserver/web/log:/var/log/nginx \
-  jumpserver/jms_all:v3.10.0
+  jumpserver/jms_all:v3.10.1
 ```
 
 **升级**
@@ -118,7 +118,7 @@ mysqldump -h$DB_HOST -p$DB_PORT -u$DB_USER -p$DB_PASSWORD $DB_NAME > /opt/jumpse
 # 例: mysqldump -h192.168.100.11 -p3306 -ujumpserver -pnu4x599Wq7u0Bn8EABh3J91G jumpserver > /opt/jumpserver-v2.12.0.sql
 
 # 拉取新版本镜像
-docker pull jumpserver/jms_all:v3.10.0
+docker pull jumpserver/jms_all:v3.10.1
 
 # 删掉旧版本容器
 docker rm jms_all
@@ -147,4 +147,4 @@ docker run --name jms_all -d \
   -v /opt/jumpserver/kael/data:/opt/kael/data \
   -v /opt/jumpserver/chen/data:/opt/chen/data \
   -v /opt/jumpserver/web/log:/var/log/nginx \
-  jumpserver/jms_all:v3.10.0
+  jumpserver/jms_all:v3.10.1

allinone/readme.txt

@@ -11,4 +11,4 @@ The Installation is Complete.
   ╚█████╔╝╚██████╔╝██║ ╚═╝ ██║██║     ███████║███████╗██║  ██║ ╚████╔╝ ███████╗██║  ██║
    ╚════╝  ╚═════╝ ╚═╝     ╚═╝╚═╝     ╚══════╝╚══════╝╚═╝  ╚═╝  ╚═══╝  ╚══════╝╚═╝  ╚═╝
 
-                                                                   VERSION: v3.10.0
+                                                                   VERSION: v3.10.1

chen/Dockerfile

@@ -1,23 +1,19 @@
 FROM jumpserver/openjdk:17-slim-buster as openjdk
 FROM debian:buster-slim
 ARG TARGETARCH
-ENV LANG=zh_CN.UTF-8
+ENV LANG=en_US.UTF-8
 
 ARG DEPENDENCIES="                    \
         ca-certificates               \
         curl                          \
-        locales                       \
         p11-kit                       \
-        telnet                        \
-        vim                           \
         wget"
 
 RUN set -ex \
     && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
     && apt-get update \
     && apt-get install -y --no-install-recommends ${DEPENDENCIES} \
     && echo "no" | dpkg-reconfigure dash \
-    && echo "zh_CN.UTF-8" | dpkg-reconfigure locales \
     && sed -i "s@# export @export @g" ~/.bashrc \
     && sed -i "s@# alias @alias @g" ~/.bashrc \
     && apt-get clean all \
@@ -51,7 +47,7 @@ RUN set -ex \
 
 WORKDIR /opt/chen
 
-ARG VERSION=v3.10.0
+ARG VERSION=v3.10.1
 ENV VERSION=${VERSION}
 
 RUN set -ex \

config_example.conf

@@ -1,5 +1,5 @@
 # 版本号可以自己根据项目的版本修改
-VERSION=v3.10.0
+VERSION=v3.10.1
 
 # 构建参数, 支持 amd64/arm64/loong64
 TARGETARCH=amd64

core/Dockerfile

@@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 WORKDIR /opt
 
-ARG VERSION=v3.10.0
+ARG VERSION=v3.10.1
 ENV VERSION=$VERSION
 
 RUN set -ex \
@@ -31,7 +31,7 @@ RUN set -ex \
 WORKDIR /opt/jumpserver
 
 RUN set -ex \
-    && wget -q https://github.com/wojiushixiaobai/jumpserver-patch/raw/${VERSION}/core/Dockerfile-ce \
+    && wget -q https://github.com/wojiushixiaobai/jumpserver-patch/raw/master/core/Dockerfile-ce \
     && cd utils \
     && bash -ixeu build.sh
 
@@ -123,10 +123,11 @@ RUN --mount=type=cache,target=/root/.cache \
 
 FROM jumpserver/python:3.11-slim-buster
 ARG TARGETARCH
-ENV LANG=zh_CN.UTF-8 \
+ENV LANG=en_US.UTF-8 \
     PATH=/opt/py3/bin:$PATH
 
 ARG DEPENDENCIES="                    \
+        freerdp2-dev                  \
         libjpeg-dev                   \
         libx11-dev                    \
         libxmlsec1-openssl"
@@ -135,15 +136,8 @@ ARG TOOLS="                           \
         ca-certificates               \
         curl                          \
         default-libmysqlclient-dev    \
-        default-mysql-client          \
-        iputils-ping                  \
-        locales                       \
-        nmap                          \
         openssh-client                \
-        patch                         \
         sshpass                       \
-        telnet                        \
-        vim                           \
         wget"
 
 RUN set -ex \
@@ -154,18 +148,18 @@ RUN set -ex \
     && apt-get -y install --no-install-recommends ${TOOLS} \
     && mkdir -p /root/.ssh/ \
     && echo "Host *\n\tStrictHostKeyChecking no\n\tUserKnownHostsFile /dev/null\n\tCiphers +aes128-cbc\n\tKexAlgorithms +diffie-hellman-group1-sha1\n\tHostKeyAlgorithms +ssh-rsa" > /root/.ssh/config \
-    && echo "set mouse-=a" > ~/.vimrc \
     && echo "no" | dpkg-reconfigure dash \
-    && echo "zh_CN.UTF-8" | dpkg-reconfigure locales \
     && sed -i "s@# export @export @g" ~/.bashrc \
-    && sed -i "s@# alias @alias @g" ~/.bashrc
+    && sed -i "s@# alias @alias @g" ~/.bashrc \
+    && apt-get clean all \
+    && rm -rf /var/lib/apt/lists/*
 
 COPY --from=stage-2 /opt/py3 /opt/py3
 COPY --from=stage-1 /opt/jumpserver/release/jumpserver /opt/jumpserver
 
 WORKDIR /opt/jumpserver
 
-ARG VERSION=v3.10.0
+ARG VERSION=v3.10.1
 ENV VERSION=${VERSION}
 
 VOLUME /opt/jumpserver/data

kael/Dockerfile

@@ -1,14 +1,10 @@
 FROM debian:buster-slim
 ARG TARGETARCH
+ENV LANG=en_US.UTF-8
 
 ARG DEPENDENCIES="                    \
         ca-certificates               \
         curl                          \
-        git                           \
-        net-tools                     \
-        unzip                         \
-        vim                           \
-        locales                       \
         wget"
 
 ARG APT_MIRROR=http://mirrors.ustc.edu.cn
@@ -19,9 +15,9 @@ RUN set -ex \
     && apt-get install -y --no-install-recommends ${DEPENDENCIES} \
     && apt-get update \
     && echo "no" | dpkg-reconfigure dash \
-    && echo "zh_CN.UTF-8" | dpkg-reconfigure locales \
     && sed -i "s@# export @export @g" ~/.bashrc \
     && sed -i "s@# alias @alias @g" ~/.bashrc \
+    && apt-get clean all \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt
@@ -36,7 +32,7 @@ RUN set -ex \
 
 WORKDIR /opt/kael
 
-ARG VERSION=v3.10.0
+ARG VERSION=v3.10.1
 ENV VERSION=${VERSION}
 
 RUN set -ex \

koko/Dockerfile

@@ -2,26 +2,22 @@ FROM jumpserver/redis:7.0-buster as redis
 
 FROM debian:buster-slim
 ARG TARGETARCH
-ENV LANG=zh_CN.UTF-8
+ENV LANG=en_US.UTF-8
 
 ARG DEPENDENCIES="                    \
-        bash-completion               \
         ca-certificates               \
         curl                          \
         libssl-dev                    \
-        locales                       \
         mariadb-client                \
         openssh-client                \
         postgresql-client             \
-        vim                           \
         wget"
 
 RUN set -ex \
     && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
     && apt-get update \
     && apt-get install -y --no-install-recommends ${DEPENDENCIES} \
     && echo "no" | dpkg-reconfigure dash \
-    && echo "zh_CN.UTF-8" | dpkg-reconfigure locales \
     && sed -i "s@# export @export @g" ~/.bashrc \
     && sed -i "s@# alias @alias @g" ~/.bashrc \
     && apt-get clean all \
@@ -78,7 +74,7 @@ RUN set -ex \
 
 WORKDIR /opt/koko
 
-ARG VERSION=v3.10.0
+ARG VERSION=v3.10.1
 ENV VERSION=${VERSION}
 
 RUN set -ex \

lion/Dockerfile

@@ -1,14 +1,11 @@
 FROM jumpserver/guacd:1.5.3-buster
 ARG TARGETARCH
-ENV LANG=zh_CN.UTF-8
+ENV LANG=en_US.UTF-8
 
 ARG DEPENDENCIES="                    \
         ca-certificates               \
         curl                          \
-        locales                       \
         supervisor                    \
-        telnet                        \
-        vim                           \
         wget"
 
 USER root
@@ -18,15 +15,14 @@ RUN set -ex \
     && apt-get update \
     && apt-get install -y --no-install-recommends ${DEPENDENCIES} \
     && echo "no" | dpkg-reconfigure dash \
-    && echo "zh_CN.UTF-8" | dpkg-reconfigure locales \
     && sed -i "s@# export @export @g" ~/.bashrc \
     && sed -i "s@# alias @alias @g" ~/.bashrc \
     && apt-get clean all \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt/lion
 
-ARG VERSION=v3.10.0
+ARG VERSION=v3.10.1
 ENV VERSION=${VERSION}
 
 RUN set -ex \

magnus/Dockerfile

@@ -1,13 +1,10 @@
 FROM debian:buster-slim
 ARG TARGETARCH
-ENV LANG=zh_CN.UTF-8
+ENV LANG=en_US.UTF-8
 
 ARG DEPENDENCIES="                    \
         ca-certificates               \
         curl                          \
-        locales                       \
-        telnet                        \
-        vim                           \
         netcat                        \
         wget"
 
@@ -16,7 +13,6 @@ RUN set -ex \
     && apt-get update \
     && apt-get install -y --no-install-recommends ${DEPENDENCIES} \
     && echo "no" | dpkg-reconfigure dash \
-    && echo "zh_CN.UTF-8" | dpkg-reconfigure locales \
     && sed -i "s@# export @export @g" ~/.bashrc \
     && sed -i "s@# alias @alias @g" ~/.bashrc \
     && apt-get clean all \
@@ -34,7 +30,7 @@ RUN set -ex \
 
 WORKDIR /opt/magnus
 
-ARG VERSION=v3.10.0
+ARG VERSION=v3.10.1
 ENV VERSION=${VERSION}
 
 RUN set -ex \