Updated SAI version to pre v1.17.0 (#265)

* Updated SAI version to pre v1.17.0
* Install cargo and rustc

Signed-off-by: Andriy Kokhan <[email protected]>

Author: andriy-kokhan

dockerfiles/bookworm/Dockerfile

@@ -42,8 +42,12 @@ RUN apt-get install -y \
 RUN apt-get install -y \
         libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev libzmq3-dev
 
-COPY sai.env /
+ARG RUST_ROOT=/usr/.cargo
+RUN RUSTUP_HOME=$RUST_ROOT CARGO_HOME=$RUST_ROOT bash -c 'curl --proto "=https" -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.86.0 -y'
+ENV RUSTUP_HOME $RUST_ROOT
+ENV PATH $PATH:$RUST_ROOT/bin
 
+COPY sai.env /
 RUN git clone --recursive https://github.com/sonic-net/sonic-swss-common \
         && cd sonic-swss-common \
         && . /sai.env \

dockerfiles/bookworm/Dockerfile.server

@@ -42,6 +42,11 @@ RUN apt-get install -y \
 RUN apt-get install -y \
         libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev libzmq3-dev
 
+ARG RUST_ROOT=/usr/.cargo
+RUN RUSTUP_HOME=$RUST_ROOT CARGO_HOME=$RUST_ROOT bash -c 'curl --proto "=https" -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.86.0 -y'
+ENV RUSTUP_HOME $RUST_ROOT
+ENV PATH $PATH:$RUST_ROOT/bin
+
 COPY sai.env /
 RUN git clone --recursive https://github.com/sonic-net/sonic-swss-common \
         && cd sonic-swss-common \

dockerfiles/bullseye/Dockerfile

@@ -40,6 +40,11 @@ RUN apt-get install -y \
 RUN apt-get install -y \
         libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev libzmq3-dev
 
+ARG RUST_ROOT=/usr/.cargo
+RUN RUSTUP_HOME=$RUST_ROOT CARGO_HOME=$RUST_ROOT bash -c 'curl --proto "=https" -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.86.0 -y'
+ENV RUSTUP_HOME $RUST_ROOT
+ENV PATH $PATH:$RUST_ROOT/bin
+
 COPY sai.env /
 RUN git clone --recursive https://github.com/sonic-net/sonic-swss-common \
         && cd sonic-swss-common \

dockerfiles/bullseye/Dockerfile.server

@@ -40,6 +40,11 @@ RUN apt-get install -y \
 RUN apt-get install -y \
         libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev libzmq3-dev
 
+ARG RUST_ROOT=/usr/.cargo
+RUN RUSTUP_HOME=$RUST_ROOT CARGO_HOME=$RUST_ROOT bash -c 'curl --proto "=https" -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.86.0 -y'
+ENV RUSTUP_HOME $RUST_ROOT
+ENV PATH $PATH:$RUST_ROOT/bin
+
 COPY sai.env /
 RUN git clone --recursive https://github.com/sonic-net/sonic-swss-common \
         && cd sonic-swss-common \

sai.env

@@ -1,13 +1,13 @@
 # The sonic-swss-common and sonic-sairedis commits were taken from
-# sonic-buildimage 202505 as of Sep 4, 2025
+# sonic-buildimage master as of Sep 5, 2025
 #
-# https://github.com/sonic-net/sonic-buildimage/tree/1694622
+# https://github.com/sonic-net/sonic-buildimage/tree/59a84f5
 
-SWSS_COMMON_ID=bcfbb21
-SAIREDIS_ID=f32256e
+SWSS_COMMON_ID=e7ee75d
+SAIREDIS_ID=9abdf0f
 
 # SAI version:
-#   Branch v1.16.1
-#   Apr 15, 2025
+#   Branch pre v1.17.0
+#   Jul 22, 2025
 
-SAI_ID=23d8579
+SAI_ID=b925fc0