mirror of
https://github.com/Ayymoss/Plutainer
synced 2026-08-24 14:32:06 -04:00
Add curl to arm64 cpp-builder stage so build2 installer runs
The build2-install-*.sh script unconditionally `check_cmd curl`s before fetching the toolchain source tarball; the stage shipped only wget, so the installer exited 1 on first ARM64 build. Add curl to the apt list and use it for the script download too for consistency. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
74ab7bd0b8
commit
51b4917239
1 changed files with 8 additions and 6 deletions
|
|
@ -33,17 +33,19 @@ FROM --platform=linux/arm64 debian:trixie-slim AS cpp-builder
|
|||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
ca-certificates wget git \
|
||||
ca-certificates curl wget git \
|
||||
g++ gcc make \
|
||||
tar xz-utils \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# build2 ships no aarch64-linux binaries; the install script compiles the
|
||||
# toolchain from source. --trust yes accepts the cppget.org repo cert without
|
||||
# manual fingerprint entry (acceptable inside a one-shot build container).
|
||||
RUN wget -q https://download.build2.org/0.18.1/build2-install-0.18.1.sh \
|
||||
&& sh build2-install-0.18.1.sh --trust yes --no-check --jobs $(nproc) --yes /usr/local \
|
||||
&& rm build2-install-0.18.1.sh
|
||||
# toolchain from source. The installer uses curl internally to fetch the
|
||||
# source tarball (see check_cmd curl in build2-install-*.sh). --trust yes
|
||||
# accepts the cppget.org repo cert without manual fingerprint entry
|
||||
# (acceptable inside a one-shot build container).
|
||||
RUN curl -fL -o build2-install.sh https://download.build2.org/0.18.1/build2-install-0.18.1.sh \
|
||||
&& sh build2-install.sh --trust yes --no-check --jobs $(nproc) --yes /usr/local \
|
||||
&& rm build2-install.sh
|
||||
|
||||
WORKDIR /build
|
||||
RUN git clone --depth 1 https://github.com/iw4x/launcher.git iw4x-launcher
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue