From c5d27dd31e367f43bec0500445ed327f77189fb3 Mon Sep 17 00:00:00 2001 From: j842 Date: Mon, 26 May 2025 17:23:07 +1200 Subject: [PATCH] ? --- Dockerfile | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index e1f24b7..13d150b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,9 +10,6 @@ ENV CFLAGS="-static -O2" \ CXXFLAGS="-static -O2" \ LDFLAGS="-static" -# Create non-root user -RUN adduser -D -u 1000 builder - # Install build dependencies RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \ apk update && \ @@ -49,30 +46,6 @@ RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repo xz-dev \ crosstool-ng -# Create crosstool-ng config -RUN mkdir -p /tmp/ct-ng && \ - chown -R builder:builder /tmp/ct-ng && \ - cd /tmp/ct-ng && \ - su builder -c "ct-ng aarch64-unknown-linux-musl" && \ - su builder -c "sed -i 's/CT_MUSL_VERSION=\"1.2.4\"/CT_MUSL_VERSION=\"1.2.4\"/' .config" && \ - su builder -c "sed -i 's/CT_GCC_VERSION=\"13.1.0\"/CT_GCC_VERSION=\"13.1.0\"/' .config" && \ - su builder -c "sed -i 's/CT_BINUTILS_VERSION=\"2.41\"/CT_BINUTILS_VERSION=\"2.41\"/' .config" && \ - su builder -c "sed -i 's/CT_LINUX_VERSION=\"6.1.28\"/CT_LINUX_VERSION=\"6.1.28\"/' .config" && \ - su builder -c "sed -i 's/CT_PARALLEL_JOBS=0/CT_PARALLEL_JOBS=$(nproc)/' .config" && \ - su builder -c "echo 'CT_EXTRA_CFLAGS_FOR_BUILD=\"-D_FILE_OFFSET_BITS=64\"' >> .config" && \ - su builder -c "echo 'CT_EXTRA_CFLAGS_FOR_HOST=\"-D_LARGEFILE64_SOURCE\"' >> .config" - -# Build the toolchain -RUN cd /tmp/ct-ng && \ - su builder -c "unset CFLAGS CXXFLAGS LDFLAGS && ct-ng build" - -# Install the toolchain -RUN mkdir -p /opt/cross && \ - cp -r /tmp/ct-ng/.build/aarch64-unknown-linux-musl/* /opt/cross/ && \ - rm -rf /tmp/ct-ng - -# Add toolchain to PATH -ENV PATH="/opt/cross/bin:${PATH}" ######################################## # nlohmann/json (compiled static .a) # @@ -149,7 +122,6 @@ ENV LD=mold # Copy pre‑built static libs + headers and cross-compiler toolchain COPY --from=builder /usr/local /usr/local -COPY --from=builder /opt/cross /opt/cross # Add toolchain to PATH ENV PATH="/opt/cross/bin:${PATH}"