use uv

metalbear-co · Oct 11, 2024 · ebc8f1d · ebc8f1d
1 parent ef235a7
commit ebc8f1d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/agent-build/builder.Dockerfile b/agent-build/builder.Dockerfile
@@ -7,5 +7,5 @@ RUN ./rustup-init.sh -y -c rustfmt --default-toolchain nightly-2024-10-11
 ENV PATH="$PATH:/root/.cargo/bin"
 RUN rustup target add --toolchain nightly-2024-10-11 x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu
 
-RUN curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py
-RUN CARGO_NET_GIT_FETCH_WITH_CLI=true python3 -m pip install cargo-zigbuild
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh
+RUN uv tool install cargo-zigbuild
diff --git a/e2e-setup-action/action.yaml b/e2e-setup-action/action.yaml
@@ -29,8 +29,9 @@ runs:
         node-version: 14
     - run: npm install express
       shell: bash
-    - uses: actions/setup-python@v3
-    - run: pip3 install flask fastapi uvicorn[standard]
+    - name: Install uv
+      uses: astral-sh/setup-uv@v3
+    - run: uv pip install --system flask fastapi uvicorn[standard]
       shell: bash
     - uses: actions/setup-go@v3
       with:

diff --git a/rust-build/Dockerfile b/rust-build/Dockerfile
@@ -4,4 +4,4 @@ RUN apt-get update && apt-get install -y protobuf-compiler
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup-init.sh
 RUN chmod +x rustup-init.sh
 RUN ./rustup-init.sh -y -c rustfmt --default-toolchain nightly-2024-10-11
-ENV PATH="$PATH:/root/.cargo/bin"
+ENV PATH="$PATH:/root/.cargo/bin"
diff --git a/tests-runner/Dockerfile b/tests-runner/Dockerfile
@@ -2,7 +2,7 @@ FROM buildpack-deps:bookworm
 
 WORKDIR /tests-runner
 
-RUN apt-get update && apt-get install -y protobuf-compiler gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-x86-64-linux-gnu curl bison npm python3-pip bash bsdmainutils ca-certificates curl gnupg zip clang
+RUN apt-get update && apt-get install -y protobuf-compiler gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-x86-64-linux-gnu curl bison npm bash bsdmainutils ca-certificates curl gnupg zip clang
 
 # docker stuff
 RUN install -m 0755 -d /etc/apt/keyrings
@@ -28,9 +28,10 @@ RUN rustup target add --toolchain nightly-2024-10-11 aarch64-unknown-linux-gnu x
 
 
 # install pip for cargo-zigbuild
-RUN curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py --break-system-packages
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh
+RUN uv tool install cargo-zigbuild
 # cargo zigbuild + Python tests dependencies
-RUN CARGO_NET_GIT_FETCH_WITH_CLI=true python3 -m pip install --break-system-packages cargo-zigbuild flask fastapi uvicorn "httptools>=0.5.0" "uvloop>=0.14.0,!=0.15.0,!=0.15.1"
+RUN uv pip install --system flask fastapi uvicorn "httptools>=0.5.0" "uvloop>=0.14.0,!=0.15.0,!=0.15.1"
 
 # npm dependencies
 RUN npm install express