Set RUSTUP_TOOLCHAIN explicitly to prevent Rust toolchain shenanigans

edgedb · Oct 17, 2024 · bdc4ef8 · bdc4ef8
1 parent ad94045
commit bdc4ef8
Show file tree

Hide file tree

Showing 23 changed files with 54 additions and 32 deletions.
diff --git a/integration/linux/build/Dockerfile-centos.template b/integration/linux/build/Dockerfile-centos.template
@@ -3,13 +3,14 @@ FROM ${DOCKER_ARCH}centos:%%PLACEHOLDER%%
 
 ENTRYPOINT ["/entrypoint.sh"]
 
-ENV PATH /usr/local/bin:/usr/local/cargo/bin:/usr/local/go/bin:$PATH
-ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
-
 ENV LANG C
 
+ENV PATH /usr/local/bin:/usr/local/cargo/bin:/usr/local/go/bin:$PATH
+ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
 ENV RUSTUP_HOME /usr/local/rustup
 ENV CARGO_HOME /usr/local/cargo
+ENV RUSTUP_TOOLCHAIN stable
+
 %%IF VARIANT=7%%
 ENV OPENSSL_VERSION 1.1.1w
 ENV PYTHON_LOCAL_OPENSSL 1

diff --git a/integration/linux/build/Dockerfile-debian.template b/integration/linux/build/Dockerfile-debian.template
@@ -9,6 +9,7 @@ ENV PATH /usr/local/bin:/usr/local/cargo/bin:/usr/local/go/bin:$PATH
 ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
 ENV RUSTUP_HOME /usr/local/rustup
 ENV CARGO_HOME /usr/local/cargo
+ENV RUSTUP_TOOLCHAIN stable
 
 RUN apt-get update \
 	&& apt-get dist-upgrade -y \

diff --git a/integration/linux/build/Dockerfile-fedora.template b/integration/linux/build/Dockerfile-fedora.template
@@ -9,6 +9,7 @@ ENV PATH /usr/local/bin:/usr/local/cargo/bin:/usr/local/go/bin:$PATH
 ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
 ENV RUSTUP_HOME /usr/local/rustup
 ENV CARGO_HOME /usr/local/cargo
+ENV RUSTUP_TOOLCHAIN stable
 
 RUN echo precedence ::ffff:0:0/96 100 >> /etc/gai.conf \
 	&& dnf install -y \

diff --git a/integration/linux/build/Dockerfile-linux.template b/integration/linux/build/Dockerfile-linux.template
@@ -9,6 +9,7 @@ ENV PATH /usr/local/bin:/usr/local/cargo/bin:/usr/local/go/bin:$PATH
 ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
 ENV RUSTUP_HOME /usr/local/rustup
 ENV CARGO_HOME /usr/local/cargo
+ENV RUSTUP_TOOLCHAIN stable
 
 %%IF VARIANT=aarch64%%
 ENV GCC_VERSION 10

diff --git a/integration/linux/build/Dockerfile-linuxmusl.template b/integration/linux/build/Dockerfile-linuxmusl.template
@@ -3,12 +3,13 @@ FROM ${DOCKER_ARCH}alpine:3.16
 
 ENTRYPOINT ["/entrypoint.sh"]
 
+ENV LANG C.UTF-8
+
 ENV PATH /usr/local/bin:/usr/local/cargo/bin:/usr/local/go/bin:$PATH
 ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
-
-ENV LANG C.UTF-8
 ENV RUSTUP_HOME /usr/local/rustup
 ENV CARGO_HOME /usr/local/cargo
+ENV RUSTUP_TOOLCHAIN stable
 
 RUN apk add --no-cache \
 		bash \

diff --git a/integration/linux/build/Dockerfile-rockylinux.template b/integration/linux/build/Dockerfile-rockylinux.template
@@ -9,6 +9,7 @@ ENV PATH /usr/local/bin:/usr/local/cargo/bin:/usr/local/go/bin:$PATH
 ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
 ENV RUSTUP_HOME /usr/local/rustup
 ENV CARGO_HOME /usr/local/cargo
+ENV RUSTUP_TOOLCHAIN stable
 
 RUN echo precedence ::ffff:0:0/96 100 >> /etc/gai.conf \
 	&& dnf install --enablerepo=devel --enablerepo=crb -y \

diff --git a/integration/linux/build/_bootstrap/rust.sh b/integration/linux/build/_bootstrap/rust.sh
@@ -6,7 +6,7 @@ set -ex
 
 cd /usr/src
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- \
-    -y --no-modify-path --profile minimal \
+    -y --no-modify-path --profile default \
     --default-toolchain "$RUST_VERSION"
 
 chmod -R a+w "$RUSTUP_HOME" "$CARGO_HOME"
diff --git a/integration/linux/build/centos-7/Dockerfile b/integration/linux/build/centos-7/Dockerfile
diff --git a/integration/linux/build/centos-8/Dockerfile b/integration/linux/build/centos-8/Dockerfile
diff --git a/integration/linux/build/debian-bookworm/Dockerfile b/integration/linux/build/debian-bookworm/Dockerfile
diff --git a/integration/linux/build/debian-bullseye/Dockerfile b/integration/linux/build/debian-bullseye/Dockerfile
diff --git a/integration/linux/build/debian-buster/Dockerfile b/integration/linux/build/debian-buster/Dockerfile
diff --git a/integration/linux/build/fedora-40/Dockerfile b/integration/linux/build/fedora-40/Dockerfile
@@ -15,6 +15,7 @@ ENV PATH /usr/local/bin:/usr/local/cargo/bin:/usr/local/go/bin:$PATH
 ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
 ENV RUSTUP_HOME /usr/local/rustup
 ENV CARGO_HOME /usr/local/cargo
+ENV RUSTUP_TOOLCHAIN stable
 
 RUN echo precedence ::ffff:0:0/96 100 >> /etc/gai.conf \
 	&& dnf install -y \
@@ -568,7 +569,7 @@ set -ex\n\
 \n\
 cd /usr/src\n\
 curl --proto '\''=https'\'' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- \\\n\
-    -y --no-modify-path --profile minimal \\\n\
+    -y --no-modify-path --profile default \\\n\
     --default-toolchain "$RUST_VERSION"\n\
 \n\
 chmod -R a+w "$RUSTUP_HOME" "$CARGO_HOME"\n\' >/_bootstrap/rust.sh; chmod +x /_bootstrap/rust.sh

diff --git a/integration/linux/build/linux-aarch64/Dockerfile b/integration/linux/build/linux-aarch64/Dockerfile
diff --git a/integration/linux/build/linux-x86_64/Dockerfile b/integration/linux/build/linux-x86_64/Dockerfile
diff --git a/integration/linux/build/linuxmusl-aarch64/Dockerfile b/integration/linux/build/linuxmusl-aarch64/Dockerfile
diff --git a/integration/linux/build/linuxmusl-x86_64/Dockerfile b/integration/linux/build/linuxmusl-x86_64/Dockerfile
diff --git a/integration/linux/build/rockylinux-9/Dockerfile b/integration/linux/build/rockylinux-9/Dockerfile
diff --git a/integration/linux/build/ubuntu-bionic/Dockerfile b/integration/linux/build/ubuntu-bionic/Dockerfile
diff --git a/integration/linux/build/ubuntu-focal/Dockerfile b/integration/linux/build/ubuntu-focal/Dockerfile
diff --git a/integration/linux/build/ubuntu-hirsute/Dockerfile b/integration/linux/build/ubuntu-hirsute/Dockerfile
diff --git a/integration/linux/build/ubuntu-jammy/Dockerfile b/integration/linux/build/ubuntu-jammy/Dockerfile
diff --git a/integration/linux/build/ubuntu-noble/Dockerfile b/integration/linux/build/ubuntu-noble/Dockerfile