diff options
Diffstat (limited to 'Containerfile')
| -rw-r--r-- | Containerfile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Containerfile b/Containerfile index 7a12114..dd4bc06 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM ubuntu:questing AS builder +FROM ubuntu:resolute AS builder ARG IMAGE_BUILD @@ -16,6 +16,8 @@ ARG GMP_VERSION ARG MPFR_VERSION ARG MPC_VERSION +ARG PYTHON_VERSION + ENV STATIC_DEPS_PREFIX=/opt/static-deps ADD ./patches /patches @@ -30,7 +32,7 @@ RUN /scripts/0400-build-target-newlib.sh RUN /scripts/0500-build-target-gcc.sh RUN /scripts/0600-build-target-gdb.sh -FROM ubuntu:questing +FROM ubuntu:resolute LABEL org.opencontainers.image.title="TeachOS Toolchain" LABEL org.opencontainers.image.description="A semi-statically linked cross-compiler toolchain for TeachOS development." @@ -39,12 +41,11 @@ LABEL org.opencontainers.image.version="$GCC_VERSION" LABEL org.opencontainers.iamge.revision="$IMAGE_BUILD" LABEL org.opencontainers.image.base.name="docker.io/ubuntu:questing" +ARG PYTHON_VERSION + RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - gnupg libstdc++6 software-properties-common wget && \ - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg && \ - echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/questing/ llvm-toolchain-questing main" > /etc/apt/sources.list.d/llvm.list && \ - DEBIAN_FRONTEND=noninteractive apt-get autoremove -y --purge gnupg software-properties-common wget && \ + libstdc++6 python$PYTHON_VERSION-dev && \ rm -rf /var/lib/apt/lists/* COPY --from=builder /opt/toolchain /opt/toolchain |