From 2deb844c5c378b4455de3f732416138e12b24f5c Mon Sep 17 00:00:00 2001 From: Lukas Garberg Date: Sun, 26 May 2024 20:48:25 +0200 Subject: [PATCH 1/2] docker: Fixed handling of certificates Fixed handling of CA certificates in nipapd Dockerfile. --- Dockerfile.nipapd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile.nipapd b/Dockerfile.nipapd index c02b58b06..bec5c5593 100644 --- a/Dockerfile.nipapd +++ b/Dockerfile.nipapd @@ -52,12 +52,14 @@ RUN apt-get update -qy && apt-get upgrade -qy \ && apt-get clean # Install any additional CA certs from ca_certs folder required by corp proxies etc -COPY ca_certs/ / +RUN mkdir /ca_certs +COPY ca_certs/ /ca_certs/ RUN mkdir -p /usr/local/share/ca-certificates \ && cp /ca_certs/*.crt /usr/local/share/ca-certificates/ || true \ && rm -rf /ca_certs \ && update-ca-certificates RUN pip3 config set global.cert /etc/ssl/certs/ca-certificates.crt +ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt COPY nipap /nipap From 558769885d83b705accf8ba9319eb3d158b714dc Mon Sep 17 00:00:00 2001 From: Lukas Garberg Date: Sun, 26 May 2024 20:51:49 +0200 Subject: [PATCH 2/2] docker: Add CA certificates to www image --- Dockerfile.www | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Dockerfile.www b/Dockerfile.www index 151878228..cf8ed2fdb 100644 --- a/Dockerfile.www +++ b/Dockerfile.www @@ -48,6 +48,16 @@ RUN apt-get update -qy && apt-get upgrade -qy \ && pip3 --no-input install --no-cache-dir envtpl==0.7.2 \ && apt-get clean +# Install any additional CA certs from ca_certs folder required by corp proxies etc +RUN mkdir /ca_certs +COPY ca_certs/ /ca_certs/ +RUN mkdir -p /usr/local/share/ca-certificates \ + && cp /ca_certs/*.crt /usr/local/share/ca-certificates/ || true \ + && rm -rf /ca_certs \ + && update-ca-certificates +RUN pip3 config set global.cert /etc/ssl/certs/ca-certificates.crt +ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt + # Install pynipap, nipap and nipap-www COPY pynipap /pynipap COPY nipap /nipap