diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile index fdd972432d..56f9279c44 100644 --- a/docker/fedora/Dockerfile +++ b/docker/fedora/Dockerfile @@ -1,6 +1,8 @@ FROM registry.fedoraproject.org/fedora:30 -ENV PATH=/usr/local/cargo/bin:$PATH +ENV RUSTUP_HOME=/usr/local/rustup \ + CARGO_HOME=/usr/local/cargo \ + PATH=/usr/local/cargo/bin:$PATH COPY prepare.sh cleanup.sh /root/ diff --git a/docker/fedora/prepare.sh b/docker/fedora/prepare.sh index b773c04045..eec0275e1d 100644 --- a/docker/fedora/prepare.sh +++ b/docker/fedora/prepare.sh @@ -202,9 +202,6 @@ RUSTUP_VERSION=1.21.0 RUST_VERSION=1.40.0 RUST_ARCH="x86_64-unknown-linux-gnu" -# rustup-init uses those variables as install paths -export RUSTUP_HOME=/usr/local/rustup -export CARGO_HOME=/usr/local/cargo dnf install -y wget RUSTUP_URL=https://static.rust-lang.org/rustup/archive/$RUSTUP_VERSION/$RUST_ARCH/rustup-init wget $RUSTUP_URL