From 26c2e7871cfa0e7cb15e5ac2ea786db5ce00ad61 Mon Sep 17 00:00:00 2001 From: yucheng Date: Thu, 24 Sep 2026 07:49:52 +0000 Subject: [PATCH] fix(docker): drop the separate cargo package, rust already provides it Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- docker/Dockerfile.fips | 1 - tests/test_litellm/test_dockerfile_fips.py | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile.fips b/docker/Dockerfile.fips index 9a4d5bcf9ec..81695483839 100644 --- a/docker/Dockerfile.fips +++ b/docker/Dockerfile.fips @@ -64,7 +64,6 @@ RUN --mount=type=secret,id=cgr-token \ bash \ gcc \ rust \ - cargo \ pkgconf \ python-3.13 \ python-3.13-dev \ diff --git a/tests/test_litellm/test_dockerfile_fips.py b/tests/test_litellm/test_dockerfile_fips.py index 4a005e42aa2..b0a214b8886 100644 --- a/tests/test_litellm/test_dockerfile_fips.py +++ b/tests/test_litellm/test_dockerfile_fips.py @@ -20,7 +20,9 @@ pytestmark = pytest.mark.skipif(not DOCKERFILE_PATH.exists(), reason="Dockerfile def _builder_stage() -> str: - match: Final = re.search(r"^FROM \S+ AS builder\n(.*?)(?=^FROM )", DOCKERFILE_PATH.read_text(), re.MULTILINE | re.DOTALL) + match: Final = re.search( + r"^FROM \S+ AS builder\n(.*?)(?=^FROM )", DOCKERFILE_PATH.read_text(), re.MULTILINE | re.DOTALL + ) assert match, "Dockerfile.fips has no `FROM ... AS builder` stage" return match.group(1) @@ -33,17 +35,14 @@ def _apk_packages(stage: str) -> frozenset[str]: apk_runs: Final = tuple(i for i in _instructions(stage) if i.startswith("RUN") and "apk add" in i) assert apk_runs, "builder stage installs nothing with apk" return frozenset( - word - for run in apk_runs - for word in shlex.split(run.split("apk add", 1)[1]) - if not word.startswith("-") + word for run in apk_runs for word in shlex.split(run.split("apk add", 1)[1]) if not word.startswith("-") ) def test_builder_installs_the_toolchain_cryptography_needs_to_compile_against_system_openssl() -> None: packages: Final = _apk_packages(_builder_stage()) - assert {"rust", "cargo", "pkgconf", "openssl-dev"} <= packages, sorted(packages) + assert {"rust", "pkgconf", "openssl-dev"} <= packages, sorted(packages) def test_builder_forbids_the_cryptography_wheel_before_the_first_uv_sync() -> None: