From c15135fa0190f86a00a068283c72f07f2595f8b4 Mon Sep 17 00:00:00 2001 From: mahdikhashan Date: Sat, 1 Feb 2025 13:49:20 +0100 Subject: [PATCH 1/7] fix flakiness Signed-off-by: mahdikhashan --- cmd/ui/v1beta1/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/ui/v1beta1/Dockerfile b/cmd/ui/v1beta1/Dockerfile index a77a51cf144..a169e03238e 100644 --- a/cmd/ui/v1beta1/Dockerfile +++ b/cmd/ui/v1beta1/Dockerfile @@ -33,12 +33,11 @@ FROM node:16 AS frontend WORKDIR /src COPY ./pkg/ui/v1beta1/frontend/package*.json ./ -RUN npm config set fetch-retry-mintimeout 20000 && \ - npm config set fetch-retry-maxtimeout 120000 && \ +RUN npm config set fetch-retry-mintimeout 200000 && \ + npm config set fetch-retry-maxtimeout 1200000 && \ npm config get registry && \ npm config set registry https://registry.npmjs.org/ && \ - npm config get https-proxy && \ - npm config rm https-proxy && \ + npm config delete https-proxy && \ npm ci COPY ./pkg/ui/v1beta1/frontend/ . From 222c4457bfa44afa8de00f97b2867218b071076b Mon Sep 17 00:00:00 2001 From: mahdikhashan Date: Sat, 1 Feb 2025 14:03:39 +0100 Subject: [PATCH 2/7] fix flakiness 2 Signed-off-by: mahdikhashan --- cmd/ui/v1beta1/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/ui/v1beta1/Dockerfile b/cmd/ui/v1beta1/Dockerfile index a169e03238e..2d9b54b8d95 100644 --- a/cmd/ui/v1beta1/Dockerfile +++ b/cmd/ui/v1beta1/Dockerfile @@ -21,8 +21,7 @@ RUN npm config set fetch-retry-mintimeout 200000 && \ npm config set fetch-retry-maxtimeout 1200000 && \ npm config get registry && \ npm config set registry https://registry.npmjs.org/ && \ - npm config get https-proxy && \ - npm config rm https-proxy && \ + npm config delete https-proxy && \ npm ci COPY --from=fetch-kubeflow-kubeflow $LIB/ ./ From f4862e55475ddda658b0eff8328082bfd92e9e96 Mon Sep 17 00:00:00 2001 From: mahdikhashan Date: Sat, 1 Feb 2025 14:33:35 +0100 Subject: [PATCH 3/7] fix flakiness 3 Signed-off-by: mahdikhashan --- cmd/ui/v1beta1/Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/ui/v1beta1/Dockerfile b/cmd/ui/v1beta1/Dockerfile index 2d9b54b8d95..16392278fa2 100644 --- a/cmd/ui/v1beta1/Dockerfile +++ b/cmd/ui/v1beta1/Dockerfile @@ -11,7 +11,7 @@ RUN git clone https://github.com/kubeflow/kubeflow.git && \ git checkout $COMMIT # --- Build the frontend kubeflow library --- -FROM node:16 AS frontend-kubeflow-lib +FROM node:16-alpine AS frontend-kubeflow-lib WORKDIR /src @@ -22,13 +22,15 @@ RUN npm config set fetch-retry-mintimeout 200000 && \ npm config get registry && \ npm config set registry https://registry.npmjs.org/ && \ npm config delete https-proxy && \ + npm config set loglevel verbose && \ + npm cache clean --force && \ npm ci COPY --from=fetch-kubeflow-kubeflow $LIB/ ./ RUN npm run build # --- Build the frontend --- -FROM node:16 AS frontend +FROM node:16-alpine AS frontend WORKDIR /src COPY ./pkg/ui/v1beta1/frontend/package*.json ./ @@ -37,6 +39,8 @@ RUN npm config set fetch-retry-mintimeout 200000 && \ npm config get registry && \ npm config set registry https://registry.npmjs.org/ && \ npm config delete https-proxy && \ + npm config set loglevel verbose && \ + npm cache clean --force && \ npm ci COPY ./pkg/ui/v1beta1/frontend/ . From 324d7701cfa74c6ecadd70c03718e7e6ed2365f0 Mon Sep 17 00:00:00 2001 From: mahdikhashan Date: Sat, 1 Feb 2025 15:31:28 +0100 Subject: [PATCH 4/7] use alpine for first stage Signed-off-by: mahdikhashan --- cmd/ui/v1beta1/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/ui/v1beta1/Dockerfile b/cmd/ui/v1beta1/Dockerfile index 16392278fa2..6fc30d73f0d 100644 --- a/cmd/ui/v1beta1/Dockerfile +++ b/cmd/ui/v1beta1/Dockerfile @@ -1,7 +1,7 @@ # --- Clone the kubeflow/kubeflow code --- -FROM ubuntu AS fetch-kubeflow-kubeflow +FROM alpine:3.15 AS fetch-kubeflow-kubeflow -RUN apt-get update && apt-get install git -y +RUN apk add --no-cache git WORKDIR /kf COPY ./pkg/ui/v1beta1/frontend/COMMIT ./ From 32217be4048c49c3dcfc13430bdd505572b961db Mon Sep 17 00:00:00 2001 From: mahdikhashan Date: Sat, 1 Feb 2025 15:43:21 +0100 Subject: [PATCH 5/7] use alpline git Signed-off-by: mahdikhashan --- cmd/ui/v1beta1/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmd/ui/v1beta1/Dockerfile b/cmd/ui/v1beta1/Dockerfile index 6fc30d73f0d..7bb7b7bd2ec 100644 --- a/cmd/ui/v1beta1/Dockerfile +++ b/cmd/ui/v1beta1/Dockerfile @@ -1,7 +1,5 @@ # --- Clone the kubeflow/kubeflow code --- -FROM alpine:3.15 AS fetch-kubeflow-kubeflow - -RUN apk add --no-cache git +FROM alpine/git AS fetch-kubeflow-kubeflow WORKDIR /kf COPY ./pkg/ui/v1beta1/frontend/COMMIT ./ From 080d214685c36de1efcac89caa407a1b0ed41b2a Mon Sep 17 00:00:00 2001 From: mahdikhashan Date: Sat, 1 Feb 2025 16:23:56 +0100 Subject: [PATCH 6/7] no security audit Signed-off-by: mahdikhashan --- cmd/ui/v1beta1/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/ui/v1beta1/Dockerfile b/cmd/ui/v1beta1/Dockerfile index 7bb7b7bd2ec..d158608f81f 100644 --- a/cmd/ui/v1beta1/Dockerfile +++ b/cmd/ui/v1beta1/Dockerfile @@ -22,7 +22,7 @@ RUN npm config set fetch-retry-mintimeout 200000 && \ npm config delete https-proxy && \ npm config set loglevel verbose && \ npm cache clean --force && \ - npm ci + npm ci --no-audit COPY --from=fetch-kubeflow-kubeflow $LIB/ ./ RUN npm run build @@ -39,7 +39,7 @@ RUN npm config set fetch-retry-mintimeout 200000 && \ npm config delete https-proxy && \ npm config set loglevel verbose && \ npm cache clean --force && \ - npm ci + npm ci --no-audit COPY ./pkg/ui/v1beta1/frontend/ . COPY --from=frontend-kubeflow-lib /src/dist/kubeflow/ ./node_modules/kubeflow/ From eec58cb662755d346113f4eef3d97a5d25b98c8a Mon Sep 17 00:00:00 2001 From: mahdikhashan Date: Sat, 1 Feb 2025 17:02:20 +0100 Subject: [PATCH 7/7] force npm ci Signed-off-by: mahdikhashan --- cmd/ui/v1beta1/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/ui/v1beta1/Dockerfile b/cmd/ui/v1beta1/Dockerfile index d158608f81f..2deb5137507 100644 --- a/cmd/ui/v1beta1/Dockerfile +++ b/cmd/ui/v1beta1/Dockerfile @@ -22,7 +22,7 @@ RUN npm config set fetch-retry-mintimeout 200000 && \ npm config delete https-proxy && \ npm config set loglevel verbose && \ npm cache clean --force && \ - npm ci --no-audit + npm ci --force --prefer-offline --no-audit COPY --from=fetch-kubeflow-kubeflow $LIB/ ./ RUN npm run build @@ -39,7 +39,7 @@ RUN npm config set fetch-retry-mintimeout 200000 && \ npm config delete https-proxy && \ npm config set loglevel verbose && \ npm cache clean --force && \ - npm ci --no-audit + npm ci --force --prefer-offline --no-audit COPY ./pkg/ui/v1beta1/frontend/ . COPY --from=frontend-kubeflow-lib /src/dist/kubeflow/ ./node_modules/kubeflow/