simplifying more

Author: seriousben

server/dockerfiles/Dockerfile.builder_linux_aarch64

@@ -1,9 +1,10 @@
 FROM ubuntu:24.04
 
-RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
-    build-essential npm curl \
-    g++-aarch64-linux-gnu \
-    libc6-dev-arm64-cross git clang
+RUN apt-get update && \
+    apt-get install --assume-yes --no-install-recommends \
+    build-essential pkg-config clang \
+    g++-aarch64-linux-gnu libc6-dev-arm64-cross \
+    git curl
 
 RUN curl -fsSL https://deb.nodesource.com/setup_22.x -o nodesource_setup.sh && \
     bash -E nodesource_setup.sh && \
@@ -14,6 +15,4 @@ ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     AR_aarch64_unknown_linux_gnu="$CROSS_TOOLCHAIN_PREFIX"ar \
     CC_aarch64_unknown_linux_gnu="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CXX_aarch64_unknown_linux_gnu="$CROSS_TOOLCHAIN_PREFIX"g++ \
-    PKG_CONFIG_PATH="/usr/lib/aarch64-linux-gnu/pkgconfig/:${PKG_CONFIG_PATH}"
-
-ENV RUSTFLAGS="-L /opt/sysroot/usr/lib"
+    PKG_CONFIG_PATH="/usr/lib/aarch64-linux-gnu/pkgconfig/:${PKG_CONFIG_PATH}"

server/dockerfiles/Dockerfile.builder_linux_x86

@@ -2,14 +2,10 @@ FROM ubuntu:24.04
 
 RUN apt-get update && \
     apt-get install --assume-yes --no-install-recommends \
-    software-properties-common unzip \
-    build-essential make cmake ca-certificates \
-    curl pkg-config git \
-    sqlite3 clang gcc-10 g++-10
+    build-essential pkg-config clang \
+    g++ \
+    git curl
 
 RUN curl -fsSL https://deb.nodesource.com/setup_22.x -o nodesource_setup.sh && \
     bash -E nodesource_setup.sh && \
-    apt-get install --assume-yes --no-install-recommends nodejs
-
-RUN apt remove -y gcc-9 g++-9
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 20 --slave /usr/bin/g++ g++ /usr/bin/g++-10
+    apt-get install --assume-yes --no-install-recommends nodejs