From 4c6f4b2dd5530a10485e11c0cbe9361a53d7303d Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sun, 8 Oct 2023 20:52:24 +0200 Subject: [PATCH] ld: pin alpine to 3.18 Signed-off-by: CrazyMax --- src/ld/Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ld/Dockerfile b/src/ld/Dockerfile index 5f1126e..ca567e7 100644 --- a/src/ld/Dockerfile +++ b/src/ld/Dockerfile @@ -1,5 +1,6 @@ #syntax=docker/dockerfile:1.5 +ARG ALPINE_VERSION=3.18 ARG LIBTAPI_VERSION=1100.0.11 ARG CCTOOLS_VERSION=949.0.1-ld64-530 ARG SIGTOOL_VERSION=1dafd2ca4651210ba9acce10d279ace22b50fb01 @@ -9,7 +10,7 @@ ARG BINUTILS_VERSION=2.40 FROM --platform=$BUILDPLATFORM tonistiigi/xx AS xx -FROM --platform=${BUILDPLATFORM} alpine AS libtapi-base +FROM --platform=${BUILDPLATFORM} alpine:${ALPINE_VERSION} AS libtapi-base RUN apk add --no-cache git clang lld cmake make python3 bash COPY --from=xx / / ARG LIBTAPI_VERSION @@ -42,7 +43,7 @@ RUN export INSTALLPREFIX=/opt/libtapi/ \ ./build.sh && cd build && make -j $(nproc) LLVMObject tapiCore LLVMSupport LLVMDemangle LLVMMC LLVMBinaryFormat install-tapi-headers && mkdir /opt/libtapi/lib && cp -a ./lib/*.a /opt/libtapi/lib/ && \ cd .. && rm -rf build -FROM --platform=${BUILDPLATFORM} alpine AS cctools-base +FROM --platform=${BUILDPLATFORM} alpine:${ALPINE_VERSION} AS cctools-base RUN apk add --no-cache git clang lld make llvm COPY --from=xx / / WORKDIR /work @@ -101,7 +102,7 @@ COPY --from=ld64-static / / COPY --from=sigtool / / COPY ld64.signed / -FROM --platform=$BUILDPLATFORM alpine AS ld64-tgz-build +FROM --platform=$BUILDPLATFORM alpine:${ALPINE_VERSION} AS ld64-tgz-build WORKDIR /work ARG TARGETOS TARGETARCH TARGETVARIANT RUN --mount=from=ld64-signed-static \ @@ -127,7 +128,7 @@ FROM scratch AS cctools COPY --from=libtapi /opt/libtapi/lib/*.so /usr/lib/ COPY --from=cctools-build /opt/cctools /usr -FROM --platform=${BUILDPLATFORM} alpine AS sigtool-base +FROM --platform=${BUILDPLATFORM} alpine:${ALPINE_VERSION} AS sigtool-base RUN apk add --no-cache git clang lld cmake make pkgconf COPY --from=xx / / WORKDIR /work @@ -156,7 +157,7 @@ FROM scratch AS sigtool COPY --from=codesign-static / / COPY --from=sigtool-base /work/sigtool/build/gensig /sigtool-gensig -FROM --platform=$BUILDPLATFORM alpine AS binutils-base0 +FROM --platform=$BUILDPLATFORM alpine:${ALPINE_VERSION} AS binutils-base0 RUN apk add --no-cache file git clang lld linux-headers zlib-dev zstd-dev gcc patch make musl-dev musl-libintl bison flex texinfo WORKDIR /work ARG BINUTILS_PATCHES_VERSION