From f0038c8f9c61648587dfeb2c1b2b2b0530fcf7cf Mon Sep 17 00:00:00 2001 From: "Lance R. Vick" Date: Sat, 13 Jan 2024 11:15:45 -0800 Subject: [PATCH] fix wget pull for llvm and ninja --- src/core/llvm/Dockerfile | 4 +++- src/core/ninja/Dockerfile | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/core/llvm/Dockerfile b/src/core/llvm/Dockerfile index 1b5761e..f1d6dec 100644 --- a/src/core/llvm/Dockerfile +++ b/src/core/llvm/Dockerfile @@ -9,6 +9,7 @@ FROM ${REGISTRY}/py-setuptools as py-setuptools FROM ${REGISTRY}/cmake as cmake FROM ${REGISTRY}/ninja as ninja FROM ${REGISTRY}/busybox as busybox +FROM ${REGISTRY}/openssl as openssl FROM busybox as base ARG VERSION @@ -24,9 +25,10 @@ COPY --from=musl . / COPY --from=gcc . / COPY --from=python . / COPY --from=py-setuptools . / +COPY --from=openssl . / 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 FROM fetch as build diff --git a/src/core/ninja/Dockerfile b/src/core/ninja/Dockerfile index 459a513..e193b8b 100644 --- a/src/core/ninja/Dockerfile +++ b/src/core/ninja/Dockerfile @@ -5,6 +5,8 @@ FROM ${REGISTRY}/python:latest as python FROM ${REGISTRY}/musl:latest as musl FROM ${REGISTRY}/gcc:latest as gcc FROM ${REGISTRY}/busybox:latest as busybox +FROM ${REGISTRY}/ca-certificates:latest as ca-certificates +FROM ${REGISTRY}/openssl:latest as openssl FROM busybox as base ENV SRC_SITE=https://github.com/martine/ninja/archive/ @@ -15,9 +17,11 @@ COPY --from=make . / COPY --from=python . / COPY --from=musl . / COPY --from=gcc . / +COPY --from=openssl . / +FROM ${REGISTRY}/busybox:latest as busybox 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 FROM fetch as build