From 23dec225a97554705f9331874dfaa78734ac25f3 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Wed, 15 Jan 2025 15:18:15 +0100 Subject: [PATCH] build(docker/frontend): fix conditional npm proxy conf --- docker/frontend/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index da4026a36..df31c49e2 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -21,8 +21,8 @@ ENV CHROME_BIN=chromium # RUN n 20.17.0 # configure npm to use given proxy if given -RUN ${HTTP_PROXY} && npm config set proxy ${HTTP_PROXY} -RUN ${FRAPORT_NOPROXY} && npm config set noproxy "${FRAPORT_NOPROXY}" +RUN if [ ! -z "${HTTP_PROXY}" ]; then npm config set proxy ${HTTP_PROXY}; fi +RUN if [ ! -z "${FRAPORT_NOPROXY}" ]; then npm config set noproxy "${FRAPORT_NOPROXY}"; fi ENV NODE_EXTRA_CA_CERTS: "/etc/ssl/certs/ca-certificates.crt" # locally these two should be identical, so that compilation results are written out into the file dir.