chore: remove need for build & targetplatform in scripts

Author: kristof-mattei

Dockerfile

@@ -24,11 +24,6 @@ ARG TARGET=aarch64-unknown-linux-musl
 
 FROM rust-${TARGETPLATFORM//\//-} AS rust-cargo-build
 
-# expose (used in ./setup.sh and ./build.sh)
-ARG BUILDPLATFORM
-ARG TARGETPLATFORM
-ARG TARGETARCH
-
 COPY ./setup-env.sh .
 RUN --mount=type=cache,id=apt-cache,from=rust-base,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,id=apt-lib,from=rust-base,target=/var/lib/apt,sharing=locked \
@@ -58,11 +53,6 @@ RUN --mount=type=cache,target=/build/${APPLICATION_NAME}/target \
 # Rust full build
 FROM rust-cargo-build AS rust-build
 
-# expose (used in ./build.sh)
-ARG BUILDPLATFORM
-ARG TARGETPLATFORM
-ARG TARGETARCH
-
 WORKDIR /build/${APPLICATION_NAME}
 
 # now we copy in the source which is more prone to changes and build it

build.sh

@@ -7,18 +7,18 @@ 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
-    ;;
+    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

setup-env.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 dpkg_add_arch() {
-    # mind the space between the [ and "
-    if [[ "$BUILDPLATFORM" != "$TARGETPLATFORM" ]]; then
+    # are we cross compiling?
+    if ! dpkg-architecture -eq "$1"; then
         dpkg --add-architecture $1
     fi
     apt-get update