Skip to content

Commit 7d3f465

Browse files
committed
ci: Remove redundant rustup toolchain in Dockerfile-rust
1 parent 33f76bc commit 7d3f465

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## [Unreleased]
44

5+
### Bug Fixes:
6+
7+
- fix(docker): Use base image toolchain instead of reinstalling stable, which could pull in an unvalidated Rust version.
8+
59
### Breaking:
610

711
- breaking(domain) - service-version oriented `domain` commands have been moved under the `service domain` command. Versionless `domain-v1` commands have been moved to the `domain` command ([#1615](https://github.com/fastly/cli/pull/1615))

Dockerfile-rust

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
FROM rust:latest
22
LABEL maintainer="Fastly OSS <oss@fastly.com>"
33

4-
ENV RUST_TOOLCHAIN=stable
5-
RUN rustup toolchain install ${RUST_TOOLCHAIN} \
6-
&& rustup target add wasm32-wasip1 --toolchain ${RUST_TOOLCHAIN} \
4+
ENV RUSTUP_TOOLCHAIN=$RUST_VERSION
5+
RUN rustup target add wasm32-wasip1 \
76
&& apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /var/lib/apt/lists/* \
87
&& cargo install wasm-tools --locked \
98
&& export FASTLY_CLI_VERSION=$(curl -s https://api.github.com/repos/fastly/cli/releases/latest | jq -r .tag_name | cut -d 'v' -f 2) \

0 commit comments

Comments
 (0)