diff --git a/lifecycle/container/Dockerfile b/lifecycle/container/Dockerfile index 39c41b1f39d7..4d7e4436a599 100644 --- a/lifecycle/container/Dockerfile +++ b/lifecycle/container/Dockerfile @@ -96,11 +96,13 @@ WORKDIR /ak-root/ COPY --from=uv /uv /uvx /bin/ # Stage 6: Python dependencies +FROM docker.io/library/rust:1.94.1-slim-trixie@sha256:1d0000a49fb62f4fde24455f49d59c6c088af46202d65d8f455b722f7263e8f8 AS rust FROM python-base AS python-deps ARG TARGETARCH ARG TARGETVARIANT +COPY --from=rust /usr/local/cargo/bin/rustup /usr/bin/rustup RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache ENV PATH="/root/.cargo/bin:$PATH" @@ -123,7 +125,6 @@ RUN --mount=type=cache,id=apt-$TARGETARCH$TARGETVARIANT,sharing=locked,target=/v # xmlsec libltdl-dev && \ export RUST_TOOLCHAIN="$(awk -F'\"' '/^[[:space:]]*channel[[:space:]]*=/{print $2; exit}' rust-toolchain.toml)" && \ - curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal --default-toolchain "${RUST_TOOLCHAIN}" && \ rustup default "${RUST_TOOLCHAIN}" && \ rustc --version && \ cargo --version diff --git a/website/scripts/docsmg/README.md b/website/scripts/docsmg/README.md index 357db62f81f2..807bad876608 100644 --- a/website/scripts/docsmg/README.md +++ b/website/scripts/docsmg/README.md @@ -12,7 +12,7 @@ Use this migration tool to: ## Steps to install 1. Verify that you have the latest version of rust installed - - Install [rust](rustup.rs) or update rust to the latest version with `rustup update` + - Install [rust](https://rustup.rs) or update rust to the latest version with `rustup update` - If installing rust from scratch, you may need to run `. $HOME/.cargo/env` 2. Install the cli tool with `cargo install --git https://github.com/goauthentik/authentik --bin docsmg` 3. In the `/website` directory, create a file named `docsmg.env` with the entry of `MIGRATE_PATH=./docs`.