Skip to content

Commit 1a1050d

Browse files
authored
fix(ci): request ARG in every build stage (#23049)
1 parent 346b1ba commit 1a1050d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

scripts/e2e/Dockerfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
ARG RUST_VERSION
22
ARG FEATURES
3-
ARG DEBIAN_RELEASE=slim-bookworm
43

5-
FROM docker.io/rust:${RUST_VERSION}-${DEBIAN_RELEASE}
4+
FROM docker.io/rust:${RUST_VERSION}-slim-bookworm
65

76
RUN apt-get update && apt-get -y --no-install-recommends install \
87
build-essential \
@@ -28,7 +27,7 @@ RUN git clone https://github.com/rui314/mold.git \
2827
&& cmake --build . -j $(nproc) \
2928
&& cmake --install .
3029

31-
RUN rustup run "${RUST_VERSION}" cargo install cargo-nextest --version 0.9.72 --locked
30+
RUN cargo install cargo-nextest --version 0.9.72 --locked
3231

3332
COPY scripts/environment/install-protoc.sh /
3433
COPY tests/data/ca/certs /certs

tilt/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RUN --mount=type=cache,target=/vector/target \
3131
#
3232
# TARGET
3333
#
34+
ARG DEBIAN_RELEASE
3435
FROM docker.io/debian:${DEBIAN_RELEASE}-slim
3536
RUN apt-get update && apt-get -y --no-install-recommends install zlib1g && rm -rf /var/lib/apt/lists/*
3637
COPY --from=builder /vector/vector /usr/bin/vector

0 commit comments

Comments
 (0)