fix wget pull for llvm and ninja

This commit is contained in:
Lance Vick 2024-01-13 11:15:45 -08:00
parent 5cc99f5692
commit f0038c8f9c
Signed by: lrvick
GPG Key ID: 8E47A1EC35A1551D
2 changed files with 8 additions and 2 deletions

View File

@ -9,6 +9,7 @@ FROM ${REGISTRY}/py-setuptools as py-setuptools
FROM ${REGISTRY}/cmake as cmake FROM ${REGISTRY}/cmake as cmake
FROM ${REGISTRY}/ninja as ninja FROM ${REGISTRY}/ninja as ninja
FROM ${REGISTRY}/busybox as busybox FROM ${REGISTRY}/busybox as busybox
FROM ${REGISTRY}/openssl as openssl
FROM busybox as base FROM busybox as base
ARG VERSION ARG VERSION
@ -24,9 +25,10 @@ COPY --from=musl . /
COPY --from=gcc . / COPY --from=gcc . /
COPY --from=python . / COPY --from=python . /
COPY --from=py-setuptools . / COPY --from=py-setuptools . /
COPY --from=openssl . /
FROM base as fetch FROM base as fetch
RUN wget ${SRC_SITE}/llvmorg-${SRC_VERSION}/llvm-project-${SRC_VERSION}.src.tar.xz RUN wget --no-check-certificate ${SRC_SITE}/llvmorg-${SRC_VERSION}/llvm-project-${SRC_VERSION}.src.tar.xz
RUN echo "$(printenv SRC_HASH_${VERSION//./_}) llvm-project-${SRC_VERSION}.src.tar.xz" | sha256sum -c RUN echo "$(printenv SRC_HASH_${VERSION//./_}) llvm-project-${SRC_VERSION}.src.tar.xz" | sha256sum -c
FROM fetch as build FROM fetch as build

View File

@ -5,6 +5,8 @@ FROM ${REGISTRY}/python:latest as python
FROM ${REGISTRY}/musl:latest as musl FROM ${REGISTRY}/musl:latest as musl
FROM ${REGISTRY}/gcc:latest as gcc FROM ${REGISTRY}/gcc:latest as gcc
FROM ${REGISTRY}/busybox:latest as busybox FROM ${REGISTRY}/busybox:latest as busybox
FROM ${REGISTRY}/ca-certificates:latest as ca-certificates
FROM ${REGISTRY}/openssl:latest as openssl
FROM busybox as base FROM busybox as base
ENV SRC_SITE=https://github.com/martine/ninja/archive/ ENV SRC_SITE=https://github.com/martine/ninja/archive/
@ -15,9 +17,11 @@ COPY --from=make . /
COPY --from=python . / COPY --from=python . /
COPY --from=musl . / COPY --from=musl . /
COPY --from=gcc . / COPY --from=gcc . /
COPY --from=openssl . /
FROM ${REGISTRY}/busybox:latest as busybox
FROM base as fetch FROM base as fetch
RUN wget ${SRC_SITE}/v${SRC_VERSION}.tar.gz RUN wget --no-check-certificate ${SRC_SITE}/v${SRC_VERSION}.tar.gz
RUN echo "${SRC_HASH} v${SRC_VERSION}.tar.gz" | sha256sum -c RUN echo "${SRC_HASH} v${SRC_VERSION}.tar.gz" | sha256sum -c
FROM fetch as build FROM fetch as build