build: bump Alpine version to 3.21

.cargo/config-release.toml

@@ -5,7 +5,10 @@
 rustflags = ["-C", "target-feature=-crt-static"]
 
 [target.x86_64-unknown-linux-musl]
-rustflags = ["-C", "target-feature=-crt-static"]
+rustflags = ["-C", "target-feature=-crt-static", "-C", "target-cpu=x86-64-v3"]
+
+[target.x86_64-unknown-linux-gnu]
+rustflags = ["-C", "target-feature=-crt-static", "-C", "target-cpu=x86-64-v3"]
 
 [target.aarch64-unknown-linux-gnu]
 linker = "aarch64-linux-gnu-gcc"

.cargo/config.toml

@@ -4,7 +4,24 @@
 rustflags = ["-C", "target-feature=-crt-static", "--cfg", "tokio_unstable"]
 
 [target.x86_64-unknown-linux-musl]
-rustflags = ["-C", "target-feature=-crt-static", "--cfg", "tokio_unstable"]
+rustflags = [
+    "-C",
+    "target-feature=-crt-static",
+    "--cfg",
+    "tokio_unstable",
+    "-C",
+    "target-cpu=x86-64",
+]
+
+[target.x86_64-unknown-linux-gnu]
+rustflags = [
+    "-C",
+    "target-feature=-crt-static",
+    "--cfg",
+    "tokio_unstable",
+    "-C",
+    "target-cpu=x86-64",
+]
 
 [target.aarch64-unknown-linux-gnu]
 linker = "aarch64-linux-gnu-gcc"

Dockerfile

@@ -44,7 +44,7 @@
 # conflicts in case of parallel compilation.
 # 3. Configuration variables are shared between runs using /root/env file.
 
-ARG ALPINE_VERSION=3.18
+ARG ALPINE_VERSION=3.21
 
 # deps-${RUSTC_WRAPPER:-base}
 # If one of SCCACHE_GHA_ENABLED, SCCACHE_BUCKET, SCCACHE_MEMCACHED is set, then deps-sccache is used, otherwise deps-base
@@ -70,12 +70,13 @@ RUN apk add --no-cache \
         bash \
         binutils \
         ca-certificates \
-        clang-static clang-dev \
+        clang18-static clang18-dev \
         cmake \
+        curl \
         git \
         libc-dev \
         linux-headers \
-        llvm-static llvm-dev  \
+        llvm18-static llvm18-dev  \
         openssl-dev \
         snappy-static snappy-dev \
         perl \
@@ -114,9 +115,28 @@ RUN TOOLCHAIN_VERSION="$(grep channel rust-toolchain.toml | awk '{print $3}' | t
 ONBUILD ENV HOME=/root
 ONBUILD ENV CARGO_HOME=$HOME/.cargo
 
-# Configure Rust toolchain
+ONBUILD ARG CARGO_BUILD_PROFILE=dev
+
+# Configure Rust toolchain and C / C++ compiler
+RUN <<EOS
 # It doesn't sharing PATH between stages, so we need "source $HOME/.cargo/env" everywhere
-RUN echo 'source $HOME/.cargo/env' >> /root/env
+echo 'source $HOME/.cargo/env' >> /root/env
+
+# Enable gcc / g++ optimizations
+if [[ "$TARGETARCH" == "amd64" ]] ; then
+    if [[ "${CARGO_BUILD_PROFILE}" == "release" ]] ; then
+        echo "export CFLAGS=-march=x86-64-v3" >> /root/env
+        echo "export CXXFLAGS=-march=x86-64-v3" >> /root/env
+        echo "export PORTABLE=x86-64-v3" >> /root/env
+    else
+        echo "export CFLAGS=-march=x86-64" >> /root/env
+        echo "export CXXFLAGS=-march=x86-64" >> /root/env
+        echo "export PORTABLE=x86-64" >> /root/env
+    fi
+else
+    echo "export PORTABLE=1" >> /root/env
+fi
+EOS
 
 # Install protoc - protobuf compiler
 # The one shipped with Alpine does not work
@@ -129,7 +149,15 @@ RUN if [[ "$TARGETARCH" == "arm64" ]] ; then export PROTOC_ARCH=aarch_64; else e
     ln -s /opt/protoc/bin/protoc /usr/bin/
 
 # Switch to clang
-RUN rm /usr/bin/cc && ln -s /usr/bin/clang /usr/bin/cc
+# Note that CC / CXX can be updated later on (eg. when configuring sccache)
+RUN rm /usr/bin/cc && \
+    ln -sf /usr/bin/clang-18 /usr/bin/clang && \
+    ln -sf /usr/bin/clang++-18 /usr/bin/clang++ && \
+    ln -s /usr/bin/clang /usr/bin/cc
+RUN <<EOS
+echo "export CXX='clang++'" >> /root/env
+echo "export CC='clang'" >> /root/env
+EOS
 
 ARG NODE_ENV=production
 ENV NODE_ENV=${NODE_ENV}
@@ -258,14 +286,15 @@ WORKDIR /tmp/rocksdb
 # sccache -s
 # EOS
 
+# Select whether we want dev or release
+# This variable will be also visibe in next stages
+ONBUILD ARG CARGO_BUILD_PROFILE=dev
+
 RUN --mount=type=secret,id=AWS <<EOS
 set -ex -o pipefail
 git clone https://github.com/facebook/rocksdb.git -b v9.9.3 --depth 1 .
 source /root/env
 
-# Support any CPU architecture
-export PORTABLE=1
-
 make -j$(nproc) static_lib
 mkdir -p /opt/rocksdb/usr/local/lib
 cp librocksdb.a /opt/rocksdb/usr/local/lib/
@@ -320,10 +349,6 @@ RUN --mount=type=secret,id=AWS \
     --no-track \
     --no-confirm
 
-
-# Select whether we want dev or release
-ONBUILD ARG CARGO_BUILD_PROFILE=dev
-
 #
 # Rust build planner to speed up builds
 #
@@ -465,6 +490,7 @@ RUN --mount=type=cache,sharing=shared,id=cargo_registry_index,target=${CARGO_HOM
     # Remove /platform to reduce layer size
     rm -rf /platform
 
+
 #
 # STAGE: BUILD JAVASCRIPT INTERMEDIATE IMAGE
 #

packages/rs-drive-abci/Cargo.toml

@@ -113,3 +113,7 @@ grovedbg = ["drive/grovedbg"]
 [[bin]]
 name = "drive-abci"
 path = "src/main.rs"
+
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] }