feat: add rustup for base images, and use rust 1.88.0 by default

JimMoen · JimMoen · commit d4ad5efee9f1 · 2025-07-29T14:50:11.000+08:00
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -23,7 +23,7 @@ jobs:
       run: |
         #!/bin/bash
         versions="$(grep -E "^\+\sOTP-.*" ./RELEASE.md | \
-          sed -E 's/\+\sOTP-([0-9.-]*),Elixir-([0-9.]*).*/{"otp":"\1","elixir":"\2"}/g' | \
+          sed -E 's/\+\sOTP-([0-9.-]*),Elixir-([0-9.-]*),Rust-([0-9.]*).*/{"otp":"\1","elixir":"\2","rust":"\3"}/g' | \
           jq -sc .)"
 
         platforms='[
@@ -57,6 +57,7 @@ jobs:
               base_image_vsn: "5.0",
               otp: $version.otp,
               elixir: $version.elixir,
+              rust: $version.rust,
               platform: $platform,
               arch: $arch
             }
@@ -175,6 +176,7 @@ jobs:
           BUILD_FROM=${{ steps.base_tag.outputs.image }}
           OTP_VERSION=${{ matrix.otp }}
           ELIXIR_VERSION=${{ matrix.elixir }}
+          RUST_VERSION=${{ matrix.rust }}
           BUILD_WITHOUT_QUIC=1
           EMQTT_BENCH_VERSION=0.4.5
           LUX_VERSION=lux-2.6
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -35,7 +35,7 @@ jobs:
       run: |
         #!/bin/bash
         versions="$(grep -E "^\+\sOTP-.*" ./RELEASE.md | \
-          sed -E 's/\+\sOTP-([0-9.-]*),Elixir-([0-9.]*).*/{"otp":"\1","elixir":"\2"}/g' | \
+          sed -E 's/\+\sOTP-([0-9.-]*),Elixir-([0-9.-]*),Rust-([0-9.]*).*/{"otp":"\1","elixir":"\2","rust":"\3"}/g' | \
           jq -sc .)"
 
         platforms='[
@@ -69,6 +69,7 @@ jobs:
               base_image_vsn: "5.0",
               otp: $version.otp,
               elixir: $version.elixir,
+              rust: $version.rust,
               platform: $platform,
               arch: $arch
             }
@@ -120,6 +121,7 @@ jobs:
           BUILD_FROM=${{ steps.base_tag.outputs.image }}
           OTP_VERSION=${{ matrix.otp }}
           ELIXIR_VERSION=${{ matrix.elixir }}
+          RUST_VERSION=${{ matrix.rust }}
           BUILD_WITHOUT_QUIC=1
           EMQTT_BENCH_VERSION=0.4.5
           LUX_VERSION=lux-2.6
diff --git a/Dockerfile b/Dockerfile
@@ -7,11 +7,12 @@ ENV ERL_AFLAGS="-kernel shell_history enabled"
 ARG BUILD_WITHOUT_QUIC=false
 ARG OTP_VERSION=27.3.4.2-1
 ARG ELIXIR_VERSION=1.18.3
+ARG RUST_VERSION=1.88.0
 ARG FDB_VERSION=7.3.43
 ARG EMQTT_BENCH_VERSION=0.4.25
 ARG LUX_VERSION=lux-3.0
 
-COPY get-otp.sh get-zsh.sh get-elixir.sh get-fdb.sh get-emqtt-bench.sh get-lux.sh /
+COPY get-otp.sh get-zsh.sh get-elixir.sh get-fdb.sh get-rust.sh get-emqtt-bench.sh get-lux.sh /
 
 RUN if [ -f /opt/rh/devtoolset-10/enable ]; then source /opt/rh/devtoolset-10/enable; fi && \
     . /etc/os-release && export ID=$ID && export VERSION_ID=$VERSION_ID && \
@@ -22,6 +23,7 @@ RUN if [ -f /opt/rh/devtoolset-10/enable ]; then source /opt/rh/devtoolset-10/en
     /get-otp.sh ${OTP_VERSION} && \
     /get-elixir.sh ${ELIXIR_VERSION} && \
     if [ "${OTP_VERSION#26.}" != "$OTP_VERSION" ]; then /get-fdb.sh ${FDB_VERSION}; fi && \
+    /get-rust.sh ${RUST_VERSION} && \
     /get-emqtt-bench.sh ${EMQTT_BENCH_VERSION} && \
     /get-lux.sh ${LUX_VERSION} && \
     rm /get-otp.sh /get-zsh.sh /get-elixir.sh /get-fdb.sh /get-emqtt-bench.sh /get-lux.sh
diff --git a/RELEASE.md b/RELEASE.md
@@ -2,6 +2,6 @@ List per major version used by EMQX, quic, rocksdb builds
 
 OTP version from emqx/otp.git, Elixir version from elixir-lang/elixir.git.
 
-+ OTP-24.3.4.2-4,Elixir-1.15.7
-+ OTP-26.2.5.14-1,Elixir-1.15.7
-+ OTP-27.3.4.2-1,Elixir-1.18.3
++ OTP-24.3.4.2-4,Elixir-1.15.7,Rust-1.88.0
++ OTP-26.2.5.14-1,Elixir-1.15.7,Rust-1.88.0
++ OTP-27.3.4.2-1,Elixir-1.18.3,Rust-1.88.0
diff --git a/alpine3.15.1/Dockerfile b/alpine3.15.1/Dockerfile
@@ -49,4 +49,8 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
 COPY get-cmake.sh /get-cmake.sh
 RUN /get-cmake.sh build
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 CMD [ "/bin/sh" ]
diff --git a/alpine3.21.3/Dockerfile b/alpine3.21.3/Dockerfile
@@ -47,4 +47,8 @@ RUN apk add --no-cache --virtual .build-deps \
 COPY get-cmake.sh /get-cmake.sh
 RUN /get-cmake.sh build
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 CMD [ "/bin/sh" ]
diff --git a/amzn2/Dockerfile b/amzn2/Dockerfile
@@ -65,4 +65,8 @@ RUN yum clean packages && \
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 CMD [ "/bin/bash" ]
diff --git a/amzn2023/Dockerfile b/amzn2023/Dockerfile
@@ -33,4 +33,8 @@ WORKDIR /
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 CMD [ "/bin/bash" ]
diff --git a/debian10/Dockerfile b/debian10/Dockerfile
@@ -83,5 +83,9 @@ RUN /get-cmake.sh build && rm /get-cmake.sh
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 WORKDIR /
 CMD [ "/bin/bash" ]
diff --git a/debian11/Dockerfile b/debian11/Dockerfile
@@ -59,5 +59,9 @@ RUN apt-get clean\
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 WORKDIR /
 CMD [ "/bin/bash" ]
diff --git a/debian12/Dockerfile b/debian12/Dockerfile
@@ -52,4 +52,8 @@ WORKDIR /
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 CMD [ "/bin/bash" ]
diff --git a/el7/Dockerfile b/el7/Dockerfile
@@ -101,4 +101,8 @@ ENV LANG=en_US.UTF-8
 # merge the two dirs
 ENV ACLOCAL_PATH=/usr/share/aclocal:/usr/local/share/aclocal
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 CMD [ "/bin/bash" ]
diff --git a/el8/Dockerfile b/el8/Dockerfile
@@ -58,5 +58,9 @@ RUN yum clean packages && \
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 WORKDIR /
 CMD [ "/bin/bash" ]
diff --git a/el9/Dockerfile b/el9/Dockerfile
@@ -52,5 +52,9 @@ RUN dnf clean all && \
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 WORKDIR /
 CMD [ "/bin/bash" ]
diff --git a/get-rust.sh b/get-rust.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -eu
+
+RUST_VERSION="$1"
+
+if [ -n "${RUST_VERSION}" ]; then
+  rustup toolchain install ${RUST_VERSION}
+  rustup default ${RUST_VERSION}
+fi
diff --git a/raspbian10/Dockerfile b/raspbian10/Dockerfile
@@ -80,5 +80,9 @@ RUN apt-get clean\
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 WORKDIR /
 CMD [ "/bin/bash" ]
diff --git a/raspbian9/Dockerfile b/raspbian9/Dockerfile
@@ -71,5 +71,9 @@ ENV PATH=/usr/local/python3.7.4/bin:$PATH
 RUN apt-get clean\
  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 WORKDIR /
 CMD [ "/bin/bash" ]
diff --git a/ubuntu18.04/Dockerfile b/ubuntu18.04/Dockerfile
@@ -95,4 +95,8 @@ RUN /get-cmake.sh build && rm /get-cmake.sh
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 CMD [ "/bin/bash" ]
diff --git a/ubuntu20.04/Dockerfile b/ubuntu20.04/Dockerfile
@@ -64,5 +64,9 @@ RUN apt-get clean\
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 WORKDIR /
 CMD [ "/bin/bash" ]
diff --git a/ubuntu22.04/Dockerfile b/ubuntu22.04/Dockerfile
@@ -54,5 +54,9 @@ WORKDIR /
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 WORKDIR /
 CMD [ "/bin/bash" ]
diff --git a/ubuntu24.04/Dockerfile b/ubuntu24.04/Dockerfile
@@ -54,5 +54,9 @@ WORKDIR /
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
+# Install Rustup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 WORKDIR /
 CMD [ "/bin/bash" ]
