Revert changes

kubeflow · Nov 29, 2024 · ab76a49 · ab76a49
1 parent 49b2d51
commit ab76a49
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/.github/workflows/test-node.yaml b/.github/workflows/test-node.yaml
@@ -97,4 +97,5 @@ jobs:
       - name: Serve UI & run Cypress tests in Chrome and Firefox
         run: |
           cd pkg/ui/v1beta1/frontend
-          npm run start & npx wait-on http://localhost:4200 && npm run ui-test-ci-all
+          npm run start & npx wait-on http://localhost:4200
+          npm run ui-test-ci-all
diff --git a/cmd/ui/v1beta1/Dockerfile b/cmd/ui/v1beta1/Dockerfile
@@ -17,13 +17,7 @@ WORKDIR /src
 
 ARG LIB=/kf/kubeflow/components/crud-web-apps/common/frontend/kubeflow-common-lib
 COPY --from=fetch-kubeflow-kubeflow $LIB/package*.json ./
-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 ci
+RUN npm ci
 
 COPY --from=fetch-kubeflow-kubeflow $LIB/ ./
 RUN npm run build
@@ -33,13 +27,7 @@ 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 && \
-    npm config get registry && \
-    npm config set registry https://registry.npmjs.org/ && \
-    npm config get https-proxy && \
-    npm config rm https-proxy && \
-    npm ci
+RUN npm ci
 
 COPY ./pkg/ui/v1beta1/frontend/ .
 COPY --from=frontend-kubeflow-lib /src/dist/kubeflow/ ./node_modules/kubeflow/

diff --git a/pkg/ui/v1beta1/frontend/package.json b/pkg/ui/v1beta1/frontend/package.json
@@ -4,8 +4,8 @@
   "scripts": {
     "ng": "ng",
     "start": "npm run copyLibAssets && ng serve --proxy-config proxy.conf.json",
-    "build:watch": "npm run copyLibAssets && ng build --base-href /katib/ --output-path dist/static --watch",
-    "build:prod": "npm run copyLibAssets && ng build --base-href /katib/ --output-path dist/static --configuration production",
+    "build:watch": "npm run copyLibAssets && ng build --base-href /katib/ --deploy-url /katib/static/ --output-path dist/static --watch",
+    "build:prod": "npm run copyLibAssets && ng build --base-href /katib/ --deploy-url /katib/static/ --output-path dist/static --configuration production",
     "copyLibAssets": "cp -r ./node_modules/kubeflow/assets/* ./src/assets/",
     "test": "ng test",
     "test:prod": "ng test --browsers=ChromeHeadless --watch=false",
@@ -47,6 +47,7 @@
     "ngx-echarts": "^8.0.1",
     "ngx-json-viewer": "^2.4.0",
     "rxjs": "~7.4.0",
+    "tough-cookie": "~4.1.3",
     "tslib": "^2.0.0",
     "zone.js": "~0.11.4"
   },