Skip to content

Commit fbdc4c6

Browse files
authored
fix(ci): harden CI image tool installation (#572)
Signed-off-by: Piotr Mlocek <pmlocek@nvidia.com>
1 parent 1a9eea5 commit fbdc4c6

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

deploy/docker/Dockerfile.ci

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,9 @@ RUN case "$TARGETARCH" in \
5959
&& curl -fsSL "https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_${gh_arch}.tar.gz" \
6060
| tar xz --strip-components=2 -C /usr/local/bin "gh_${GH_VERSION}_linux_${gh_arch}/bin/gh"
6161

62-
# Install AWS CLI v2 used for ECR publishing
63-
RUN case "$TARGETARCH" in \
64-
amd64) aws_arch=x86_64 ;; \
65-
arm64) aws_arch=aarch64 ;; \
66-
*) echo "Unsupported TARGETARCH: $TARGETARCH"; exit 1 ;; \
67-
esac \
68-
&& curl -fsSL "https://awscli.amazonaws.com/awscli-exe-linux-${aws_arch}.zip" -o /tmp/awscliv2.zip \
69-
&& unzip -q /tmp/awscliv2.zip -d /tmp \
70-
&& /tmp/aws/install \
71-
&& rm -rf /tmp/aws /tmp/awscliv2.zip
72-
7362
# Install mise
74-
RUN curl https://mise.run | sh
63+
ARG MISE_VERSION=v2026.3.13
64+
RUN curl https://mise.run | MISE_VERSION=$MISE_VERSION sh
7565

7666
# Copy mise.toml and task includes, then install all tools via mise
7767
COPY mise.toml /opt/mise/mise.toml
@@ -81,7 +71,8 @@ RUN --mount=type=secret,id=MISE_GITHUB_TOKEN \
8171
export MISE_GITHUB_TOKEN="$(cat /run/secrets/MISE_GITHUB_TOKEN 2>/dev/null || true)" && \
8272
mise trust /opt/mise/mise.toml && \
8373
env -u RUSTC_WRAPPER mise install && \
84-
/root/.cargo/bin/rustup component remove rust-docs || true && \
74+
mise reshim && \
75+
(/root/.cargo/bin/rustup component remove rust-docs || true) && \
8576
rm -rf /root/.rustup/toolchains/*/share/doc /root/.rustup/toolchains/*/share/man
8677

8778
# Set working directory for CI jobs

0 commit comments

Comments
 (0)