diff --git a/Dockerfile b/Dockerfile index 1848fd8e8..74549672a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,9 +35,7 @@ ARG TOOLS=" \ bubblewrap" ARG APT_MIRROR=http://deb.debian.org -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core \ - --mount=type=cache,target=/var/lib/apt,sharing=locked,id=core \ - set -ex \ +RUN set -ex \ && rm -f /etc/apt/apt.conf.d/docker-clean \ && sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list \ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ diff --git a/Dockerfile-ee b/Dockerfile-ee index 63c26826b..f54656fc3 100644 --- a/Dockerfile-ee +++ b/Dockerfile-ee @@ -28,11 +28,12 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core \ ARG PIP_MIRROR=https://pypi.org/simple -RUN --mount=type=cache,target=/root/.cache,sharing=locked,id=core \ - --mount=type=bind,source=poetry.lock,target=/opt/jumpserver/poetry.lock \ +ENV POETRY_REPOSITORIES=${PIP_MIRROR} +RUN --mount=type=bind,source=poetry.lock,target=/opt/jumpserver/poetry.lock \ --mount=type=bind,source=pyproject.toml,target=/opt/jumpserver/pyproject.toml \ set -ex \ . /opt/py3/bin/activate \ && pip install poetry -i ${PIP_MIRROR} \ + && poetry config repositories.pypi ${PIP_MIRROR} \ && poetry install --only xpack diff --git a/poetry.lock b/poetry.lock index 1d6801644..6c5323842 100644 --- a/poetry.lock +++ b/poetry.lock @@ -6485,4 +6485,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = "^3.11" -content-hash = "750e14deaf075de2d69164d39ea3d7908de2bb60b75e28a8702077dbf5eb60f1" +content-hash = "772e13383945efb9a6f0b0ac97ea6db553f37e9bd7bd45a06a37a566975b8739" diff --git a/pyproject.toml b/pyproject.toml index acbce761e..161f16d2e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -193,10 +193,6 @@ huaweicloudsdkecs = "3.1.52" huaweicloudsdkcore = "3.1.52" volcengine-python-sdk = "1.0.71" -[[tool.poetry.source]] -name = "PyPI" -priority = "primary" - [build-system] requires = ["poetry-core"] build-backend = "poetry.core.masonry.api"