diff --git a/Dockerfile-base b/Dockerfile-base index 57f2973a8..9f893a1d7 100644 --- a/Dockerfile-base +++ b/Dockerfile-base @@ -52,10 +52,10 @@ RUN --mount=type=cache,target=/root/.cache \ --mount=type=bind,source=pyproject.toml,target=pyproject.toml \ --mount=type=bind,source=requirements/clean_site_packages.sh,target=clean_site_packages.sh \ --mount=type=bind,source=requirements/collections.yml,target=collections.yml \ - --mount=type=bind,source=requirements/static_files.sh,target=static_files.sh \ + --mount=type=bind,source=requirements/static_files.sh,target=utils/static_files.sh \ set -ex \ && uv venv \ && uv pip install -i${PIP_MIRROR} -r pyproject.toml \ && ln -sf $(pwd)/.venv /opt/py3 \ - && bash static_files.sh \ + && bash utils/static_files.sh \ && bash clean_site_packages.sh diff --git a/requirements/static_files.sh b/requirements/static_files.sh index 1a3335521..91d430be9 100644 --- a/requirements/static_files.sh +++ b/requirements/static_files.sh @@ -2,14 +2,19 @@ CURRENT_DIR=$(cd "$(dirname "$0")" && pwd) BASE_DIR=$(dirname "$CURRENT_DIR") - VERSION=v0.0.1 + to_files=" apps/common/utils/ip/geoip/GeoLite2-City.mmdb apps/common/utils/ip/ipip/ipipfree.ipdb apps/accounts/automations/check_account/leak_passwords.db " +if [[ $1 == "root" ]];then + BASE_DIR="${BASE_DIR}/jumpserver" +fi + + for file in $to_files; do # Check if the file already exists file_path="${BASE_DIR}/$file"