fix: 临时修复 ldap 错误

jumpserver · Jul 4, 2024 · bed4328 · bed4328
1 parent 9e26c89
commit bed4328
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/README.md b/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

diff --git a/README_EN.md b/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

diff --git a/core/Dockerfile b/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 \
@@ -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
 
@@ -87,6 +88,8 @@ RUN --mount=type=cache,target=/root/.cache,sharing=locked \
     set -e \
     && python3 -m venv /opt/py3 \
     && . /opt/py3/bin/activate \
+    && rm -f poetry.lock \
+    && sed -i 's@python-ldap = "3.4.3"@python-ldap = "3.4.4"@g' pyproject.toml \
     && poetry install --only=main
 
 COPY --from=stage-1 /opt/jumpserver /opt/jumpserver