fix: 临时修复 ldap 错误

README.md

@@ -22,7 +22,7 @@
 git clone --depth=1 https://github.com/jumpserver/Dockerfile.git
 cd Dockerfile
 cp config_example.conf .env
-docker compose -f docker-compose-network.yml -f docker-compose-redis.yml -f docker-compose-mariadb.yml -f docker-compose-init-db.yml up -d
+docker compose -f docker-compose-network.yml -f docker-compose-redis.yml -f docker-compose-mariadb.yml -f docker-compose-init-db.yml up
 docker compose -f docker-compose-network.yml -f docker-compose-redis.yml -f docker-compose-mariadb.yml -f docker-compose.yml up -d
 
 docker rm jms_init_db
@@ -106,7 +106,7 @@ SSH_PORT=2222
 # BOOTSTRAP_TOKEN 为组件认证使用的密钥, 仅组件注册时使用。组件指 koko, lion, magnus, kael, chen ...
 ```
 ```sh
-docker compose -f docker-compose-network.yml -f docker-compose-init-db.yml up -d
+docker compose -f docker-compose-network.yml -f docker-compose-init-db.yml up
 docker compose -f docker-compose-network.yml -f docker-compose.yml up -d
 
 docker rm jms_init_db

README_EN.md

@@ -22,7 +22,7 @@
 git clone --depth=1 https://github.com/jumpserver/Dockerfile.git
 cd Dockerfile
 cp config_example.conf .env
-docker compose -f docker-compose-network.yml -f docker-compose-redis.yml -f docker-compose-mariadb.yml -f docker-compose-init-db.yml up -d
+docker compose -f docker-compose-network.yml -f docker-compose-redis.yml -f docker-compose-mariadb.yml -f docker-compose-init-db.yml up
 docker compose -f docker-compose-network.yml -f docker-compose-redis.yml -f docker-compose-mariadb.yml -f docker-compose.yml up -d
 
 docker rm jms_init_db
@@ -106,7 +106,7 @@ SSH_PORT=2222
 # BOOTSTRAP_TOKEN is the key used for component authentication, only used when the component is registered. The components refer to koko, lion, magnus, kael, chen ...
 ```
 ```sh
-docker compose -f docker-compose-network.yml -f docker-compose-init-db.yml up -d
+docker compose -f docker-compose-network.yml -f docker-compose-init-db.yml up
 docker compose -f docker-compose-network.yml -f docker-compose.yml up -d
 
 docker rm jms_init_db

allinone/nginx.conf

@@ -93,16 +93,6 @@ http {
             proxy_set_header Host $host;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         }
-        location /kael/ {
-            proxy_pass http://127.0.0.1:8083;
-            proxy_buffering off;
-            proxy_http_version 1.1;
-            proxy_request_buffering off;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
-            proxy_set_header Host $host;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
         location /ws/ {
             proxy_pass http://127.0.0.1:8080;
             proxy_buffering off;

core/Dockerfile

@@ -4,6 +4,7 @@ ARG TARGETARCH
 ARG DEPENDENCIES="                    \
         ca-certificates               \
         git                           \
+        git-lfs                       \
         wget"
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
@@ -42,7 +43,7 @@ RUN set -e \
     && chmod +x /opt/jumpserver/entrypoint.sh \
     && rm -rf /opt/jumpserver/.git /opt/jumpserver/.github
 
-FROM python:3.11-slim-bullseye as stage-2
+FROM python:3.11-slim-bookworm as stage-2
 ARG TARGETARCH
 
 ARG BUILD_DEPENDENCIES="              \
@@ -66,7 +67,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     && apt-get update \
     && apt-get -y install --no-install-recommends ${BUILD_DEPENDENCIES} \
     && apt-get -y install --no-install-recommends ${DEPENDENCIES} \
-    && apt-get -y install --no-install-recommends ${TOOLS} \
     && echo "no" | dpkg-reconfigure dash
 
 WORKDIR /opt
@@ -77,7 +77,8 @@ ENV PYTHONUNBUFFERED=1 \
 
 RUN --mount=type=cache,target=/root/.cache,sharing=locked \
     set -e \
-    && pip install poetry
+    && pip install poetry \
+    && poetry config virtualenvs.create false
 
 WORKDIR /opt/jumpserver
 

web/nginx.conf

@@ -100,16 +100,6 @@ http {
             proxy_set_header Host $host;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         }
-        location /kael/ {
-            proxy_pass http://kael:8083;
-            proxy_buffering off;
-            proxy_http_version 1.1;
-            proxy_request_buffering off;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
-            proxy_set_header Host $host;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
         location /ws/ {
             proxy_pass http://core:8080;
             proxy_buffering off;