Simplify Dockerfiles

autonomys · Mar 5, 2025 · ac50c3e · ac50c3e
1 parent 89c85ce
commit ac50c3e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 25 deletions.
diff --git a/docker/bootstrap-node.Dockerfile b/docker/bootstrap-node.Dockerfile
@@ -1,7 +1,6 @@
 # This Dockerfile supports both native building and cross-compilation to x86-64, aarch64 and riscv64
 FROM --platform=$BUILDPLATFORM ubuntu:22.04
 
-ARG RUSTC_VERSION=nightly-2024-12-24
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Incremental compilation here isn't helpful
@@ -51,10 +50,7 @@ RUN \
           libc6-dev-amd64-cross \
     ; fi
 
-RUN \
-    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $RUSTC_VERSION && \
-    /root/.cargo/bin/rustup target add wasm32-unknown-unknown && \
-    /root/.cargo/bin/rustup component add rust-src --toolchain $RUSTC_VERSION
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
 
 # Up until this line all Rust images in this repo should be the same to share the same layers
 

diff --git a/docker/farmer.Dockerfile b/docker/farmer.Dockerfile
@@ -1,7 +1,6 @@
 # This Dockerfile supports both native building and cross-compilation to x86-64, aarch64 and riscv64
 FROM --platform=$BUILDPLATFORM ubuntu:22.04
 
-ARG RUSTC_VERSION=nightly-2024-12-24
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Incremental compilation here isn't helpful
@@ -51,10 +50,7 @@ RUN \
           libc6-dev-amd64-cross \
     ; fi
 
-RUN \
-    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $RUSTC_VERSION && \
-    /root/.cargo/bin/rustup target add wasm32-unknown-unknown && \
-    /root/.cargo/bin/rustup component add rust-src --toolchain $RUSTC_VERSION
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
 
 # Up until this line all Rust images in this repo should be the same to share the same layers
 

diff --git a/docker/gateway.Dockerfile b/docker/gateway.Dockerfile
@@ -1,7 +1,6 @@
 # This Dockerfile supports both native building and cross-compilation to x86-64, aarch64 and riscv64
 FROM --platform=$BUILDPLATFORM ubuntu:22.04
 
-ARG RUSTC_VERSION=nightly-2024-12-24
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Incremental compilation here isn't helpful
@@ -51,10 +50,7 @@ RUN \
           libc6-dev-amd64-cross \
     ; fi
 
-RUN \
-    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $RUSTC_VERSION && \
-    /root/.cargo/bin/rustup target add wasm32-unknown-unknown && \
-    /root/.cargo/bin/rustup component add rust-src --toolchain $RUSTC_VERSION
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
 
 # Up until this line all Rust images in this repo should be the same to share the same layers
 

diff --git a/docker/node.Dockerfile b/docker/node.Dockerfile
@@ -1,7 +1,6 @@
 # This Dockerfile supports both native building and cross-compilation to x86-64, aarch64 and riscv64
 FROM --platform=$BUILDPLATFORM ubuntu:22.04
 
-ARG RUSTC_VERSION=nightly-2024-12-24
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Incremental compilation here isn't helpful
@@ -51,10 +50,8 @@ RUN \
           libc6-dev-amd64-cross \
     ; fi
 
-RUN \
-    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $RUSTC_VERSION && \
-    /root/.cargo/bin/rustup target add wasm32-unknown-unknown && \
-    /root/.cargo/bin/rustup component add rust-src --toolchain $RUSTC_VERSION
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+
 # Up until this line all Rust images in this repo should be the same to share the same layers
 
 COPY . /code

diff --git a/docker/runtime.Dockerfile b/docker/runtime.Dockerfile
@@ -1,7 +1,6 @@
 # This Dockerfile supports both native building and cross-compilation to x86-64, aarch64 and riscv64
 FROM --platform=$BUILDPLATFORM ubuntu:22.04
 
-ARG RUSTC_VERSION=nightly-2024-12-24
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Incremental compilation here isn't helpful
@@ -51,10 +50,7 @@ RUN \
           libc6-dev-amd64-cross \
     ; fi
 
-RUN \
-    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $RUSTC_VERSION && \
-    /root/.cargo/bin/rustup target add wasm32-unknown-unknown && \
-    /root/.cargo/bin/rustup component add rust-src --toolchain $RUSTC_VERSION
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
 
 # Up until this line all Rust images in this repo should be the same to share the same layers