Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

### Bug Fixes:

- fix(docker): Use base image toolchain instead of reinstalling stable, which could pull in an unvalidated Rust version.

### Breaking:

- 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))
Expand Down
5 changes: 2 additions & 3 deletions Dockerfile-rust
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
FROM rust:latest
LABEL maintainer="Fastly OSS <oss@fastly.com>"

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