chore: i686 is 32-bit, we need 64-bit

Author: kristof-mattei

Dockerfile

@@ -1,3 +1,4 @@
+# Rust toolchain setup
 FROM --platform=${BUILDPLATFORM} rust:1.87.0@sha256:5e33ae75f40bf25854fa86e33487f47075016d16726355a72171f67362ad6bf7 AS rust-base
 
 ARG APPLICATION_NAME
@@ -23,7 +24,7 @@ ARG TARGET=aarch64-unknown-linux-musl
 
 FROM rust-${TARGETPLATFORM//\//-} AS rust-cargo-build
 
-# expose (used in ./build.sh)
+# expose (used in ./setup.sh and ./build.sh)
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM
 ARG TARGETARCH
@@ -54,6 +55,7 @@ RUN --mount=type=cache,target=/build/${APPLICATION_NAME}/target \
     --mount=type=cache,id=cargo-registery,target=/usr/local/cargo/registry/,sharing=locked \
     ./build.sh build --release --target ${TARGET}
 
+# Rust full build
 FROM rust-cargo-build AS rust-build
 
 # expose (used in ./build.sh)
@@ -75,6 +77,7 @@ RUN --mount=type=cache,target=/build/${APPLICATION_NAME}/target \
     --mount=type=cache,id=cargo-registery,target=/usr/local/cargo/registry/,sharing=locked \
     ./build.sh install --path . --target ${TARGET} --root /output
 
+# Container user setup
 FROM --platform=${BUILDPLATFORM} alpine:3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c AS passwd-build
 
 # setting `--system` prevents prompting for a password
@@ -84,6 +87,7 @@ RUN addgroup --gid 900 appgroup \
 RUN cat /etc/group | grep appuser > /tmp/group_appuser
 RUN cat /etc/passwd | grep appuser > /tmp/passwd_appuser
 
+# Final stage, no `BUILDPLATFORM`, this one is run where it is deployed
 FROM scratch
 
 ARG APPLICATION_NAME
@@ -98,4 +102,5 @@ WORKDIR /app
 COPY --from=rust-build /output/bin/${APPLICATION_NAME} /app/entrypoint
 
 ENV RUST_BACKTRACE=full
+
 ENTRYPOINT ["/app/entrypoint"]

build.sh

@@ -1,29 +1,38 @@
 #!/usr/bin/env bash
 
 # sane defaults
-compiler="gcc"
-# static linking
-flags="-Clink-self-contained=yes -Clinker=rust-lld"
-
-# mind the space between the [ and "
-if [[ "$BUILDPLATFORM" != "$TARGETPLATFORM" ]]; then
-    case $TARGET in
-        x86_64-unknown-linux-musl)
-            compiler="i686-linux-gnu-gcc"
-            ;;
-        aarch64-unknown-linux-musl)
-            compiler="aarch64-linux-gnu-gcc"
-            ;;
-        *)
-            echo "INVALID CONFIGURATION"
-            exit 1
-            ;;
-    esac
-fi
+c_compiler="gcc"
+cpp_compiler="g++"
+
+rust_flags="-Clink-self-contained=yes -Clinker=rust-lld"
+
+case $TARGET in
+x86_64-unknown-linux-*)
+    c_compiler="x86_64-linux-gnu-gcc-12"
+    cpp_compiler="x86_64-linux-gnu-g++-12"
+    ;;
+aarch64-unknown-linux-*)
+    c_compiler="aarch64-linux-gnu-gcc"
+    cpp_compiler="aarch64-linux-gnu-g++"
+    ;;
+*)
+    echo "INVALID CONFIGURATION"
+    exit 1
+    ;;
+esac
 
 # replace - with _ in the Rust target
 target_lower=${TARGET//-/_}
+
+target_upper=${target_lower^^}
+
 cc_var=CC_${target_lower}
-declare -x "${cc_var}=${compiler}"
+declare -x "${cc_var}=${c_compiler}"
+
+cxx_var=CXX_${target_lower}
+declare -x "${cxx_var}=${cpp_compiler}"
+
+cargo_target_linker_var=CARGO_TARGET_${target_upper}_LINKER
+declare -x "${cargo_target_linker_var}=${c_compiler}"
 
-RUSTFLAGS=$flags cargo $@
+RUSTFLAGS=$rust_flags cargo $@

setup-env.sh

@@ -1,30 +1,26 @@
 #!/usr/bin/env bash
 
 dpkg_add_arch() {
-    dpkg --add-architecture $1
+    # mind the space between the [ and "
+    if [[ "$BUILDPLATFORM" != "$TARGETPLATFORM" ]]; then
+        dpkg --add-architecture $1
+    fi
     apt-get update
     apt-get --no-install-recommends install --yes \
-        gcc-$2-linux-gnu
+        binutils-$2-linux-gnu \
+        gcc-$2-linux-gnu \
+        g++-$2-linux-gnu
 }
 
-# mind the space between the [ and "
-if [[ "$BUILDPLATFORM" != "$TARGETPLATFORM" ]]; then
-    case $TARGET in
-        x86_64-unknown-linux-musl)
-            dpkg_add_arch "amd64" "i686"
-
-            apt-get --no-install-recommends install --yes \
-                gcc-12-multilib-i686-linux-gnu
-            ;;
-        aarch64-unknown-linux-musl)
-            dpkg_add_arch "arm64" "aarch64"
-
-            apt-get --no-install-recommends install --yes \
-                libc6-dev-arm64-cross
-            ;;
-        *)
-            echo "INVALID CONFIGURATION"
-            exit 1
-            ;;
-    esac
-fi
+case $TARGET in
+    x86_64-unknown-linux-*)
+        dpkg_add_arch "amd64" "x86-64"
+        ;;
+    aarch64-unknown-linux-*)
+        dpkg_add_arch "arm64" "aarch64"
+        ;;
+    *)
+        echo "INVALID CONFIGURATION"
+        exit 1
+        ;;
+esac