From 1de5b5b9a0cb4baa819c9546d14826d700ef2eb3 Mon Sep 17 00:00:00 2001 From: Frikky Date: Thu, 23 Jan 2025 18:12:36 +0100 Subject: [PATCH] Bumped npm build config issues --- backend/Dockerfile | 6 +++--- frontend/Dockerfile | 9 ++++++--- functions/onprem/orborus/Dockerfile | 7 ++++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 7a1163d4..e1d8898f 100755 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -21,16 +21,16 @@ RUN go get -v # From November 2022, CGO is enabled due to packages # that we use requiring it. This is a temporary fix # and makes us HAVE to install libc compatibility packages farther down. -RUN CGO_ENABLED=1 GOOS=linux go build -a -installsuffix cgo -o webapp . +RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o webapp . # Certificate build - gets required certs -FROM alpine:latest as certs -RUN apk --update add ca-certificates +#FROM alpine:latest as certs # Sets up the final image FROM alpine:3.17.0 # FIXME: Install cgo because CGO_ENABLED=1 during build +RUN apk add --update ca-certificates RUN apk add --no-cache libc6-compat RUN apk add --no-cache libstdc++ diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 807ca56d..5ff30573 100755 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,5 +1,5 @@ # Build environment -FROM node:21 as builder +FROM node:23 as builder ENV NODE_OPTIONS="--max-old-space-size=4096" @@ -22,8 +22,11 @@ COPY ./src /usr/src/app/src/ COPY ./*.sh /usr/src/app/ COPY ./*.json /usr/src/app/ -#RUN rm -rf /usr/src/app/node_modules/webpack -#RUN yarn build --verbose +RUN npm config set fetch-retries 3 # Number of retry attempts (default is 2) +RUN npm config set fetch-retry-mintimeout 5000 # Minimum wait time before retrying (in ms, default is 10000) +RUN npm config set fetch-retry-maxtimeout 60000 # Maximum wait time before retrying (in ms, default is 60000) +RUN npm config set fetch-timeout 60000 # Overall fetch timeout (in ms, default is 300000) + RUN npm run build --loglevel verbose 2>&1 # Production environment diff --git a/functions/onprem/orborus/Dockerfile b/functions/onprem/orborus/Dockerfile index 4d0e0c6f..9e3f058d 100644 --- a/functions/onprem/orborus/Dockerfile +++ b/functions/onprem/orborus/Dockerfile @@ -7,10 +7,11 @@ COPY orborus.go /app/orborus.go COPY go.mod /app/go.mod RUN go get +RUN go build -v -#RUN go mod tidy -RUN go build -RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o orborus . +# Enabled CGO January 2025 +RUN CGO_ENABLED=1 GOOS=linux go build -a -installsuffix cgo -o orborus. +#RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o orborus . FROM alpine:3.15.0 RUN apk add --no-cache bash tzdata