clean up cross configuration

server/Cross.toml

@@ -1,7 +1,6 @@
 [target.aarch64-unknown-linux-gnu]
 dockerfile = "dockerfiles/Dockerfile.builder_linux_aarch64"
 pre-build = [
-    "apt-get update && apt-get install --assume-yes build-essential npm curl protobuf-compiler",
     "dpkg --add-architecture $CROSS_DEB_ARCH",
     "mkdir -p /.npm",
     "chown -R 1001:128 /.npm"

server/dockerfiles/Dockerfile.builder_linux_aarch64

@@ -1,22 +1,18 @@
-FROM --platform=linux/arm64/v8 python:3.11 AS python
-
-FROM ubuntu:22.04
-ARG DEBIAN_FRONTEND=noninteractive
+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 curl -sL https://deb.nodesource.com/setup_22.x | bash \
+    apt install -y nodejs
+
 ENV CROSS_TOOLCHAIN_PREFIX=aarch64-linux-gnu-
 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++ \
-    RUST_TEST_THREADS=1 \
     PKG_CONFIG_PATH="/usr/lib/aarch64-linux-gnu/pkgconfig/:${PKG_CONFIG_PATH}"
 
-RUN apt install -y python3.11 python3.11-dev
-
-COPY --from=python /usr/local/lib/ /opt/sysroot/usr/lib/
-
 ENV RUSTFLAGS="-L /opt/sysroot/usr/lib"

server/dockerfiles/Dockerfile.builder_linux_x86

@@ -1,28 +1,14 @@
-FROM ubuntu:20.04
-#LABEL stage=builder
+FROM ubuntu:24.04
 
-WORKDIR /indexify-build
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update
-RUN apt -y install software-properties-common unzip \
+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
 
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y
-
-RUN curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v25.1/protoc-25.1-linux-x86_64.zip
-
-RUN unzip protoc-25.1-linux-x86_64.zip -d /usr/local
-
-ENV PATH="/${HOME}/.cargo/bin:/{HOME}/.local/bin:${PATH}"
-
-ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
-
-RUN curl -sL https://deb.nodesource.com/setup_22.x | bash
-
-RUN apt install -y nodejs
+RUN curl -sL https://deb.nodesource.com/setup_22.x | bash \
+    apt install -y 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