diff --git a/.docker/Dockerfile.alpine b/.docker/Dockerfile.alpine index d652803b..136c20e6 100644 --- a/.docker/Dockerfile.alpine +++ b/.docker/Dockerfile.alpine @@ -73,6 +73,10 @@ RUN bash /usr/local/bin/install-bloaty.sh COPY install-static-libs.sh /usr/local/bin/install-static-libs.sh RUN bash /usr/local/bin/install-static-libs.sh gcc clang-19 :alpine +# Install the *real* ninja... +# TODO: move this up if we change anything +RUN apk add --no-cache ninja-build + # Set up git & user RUN git config --global --add safe.directory /workspace RUN adduser -G users -s bash -u 1000 -D mhx diff --git a/.docker/build-linux.sh b/.docker/build-linux.sh index 7dbd986c..0960e545 100755 --- a/.docker/build-linux.sh +++ b/.docker/build-linux.sh @@ -74,7 +74,11 @@ NINJA_LOG_FILE="${NINJA_LOG_DIR}/${BUILD_ARCH},${BUILD_DIST},${BUILD_TYPE}.log" case "-$BUILD_TYPE-" in *-ninja-*) - BUILD_TOOL=ninja + if [[ "$BUILD_DIST" == "alpine" ]]; then + BUILD_TOOL=/usr/lib/ninja-build/bin/ninja + else + BUILD_TOOL=ninja + fi CMAKE_TOOL_ARGS="-GNinja" mkdir -p "$NINJA_LOG_DIR" SAVE_BUILD_LOG="cp -a .ninja_log $NINJA_LOG_FILE"