fix: change package manager script

Signed-off-by: Oleksii Orel <oorel@redhat.com>
eclipse-che · Oct 29, 2024 · bd75e93 · bd75e93
1 parent 969a546
commit bd75e93
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 147,411 deletions.
diff --git a/build/dockerfiles/Dockerfile b/build/dockerfiles/Dockerfile
@@ -14,11 +14,8 @@ FROM docker.io/node:18.19.1-alpine3.19 as builder
 RUN apk add --no-cache python3 py3-pip make g++ jq curl
 RUN pip3 install yq --break-system-packages
 
-# hadolint ignore=DL3059,SC1072
-RUN if ! [ type "yarn" &> /dev/null ]; then \
-        apk add yarn --no-cache; \
-    fi
-
+COPY .yarn/releases /dashboard/.yarn/releases/
+COPY .yarnrc.yml /dashboard/.yarnrc.yml
 COPY package.json /dashboard/
 COPY yarn.lock /dashboard/
 COPY tsconfig.json /dashboard/
@@ -33,8 +30,6 @@ COPY ${FRONTEND}/package.json /dashboard/${FRONTEND}/
 ENV BACKEND=packages/dashboard-backend
 COPY ${BACKEND}/package.json /dashboard/${BACKEND}/
 
-COPY .yarn/releases/yarn-*.cjs /dashboard/.yarn/releases/
-COPY .yarnrc.yml /dashboard/
 WORKDIR /dashboard
 RUN yarn install --network-timeout 3600000
 COPY packages/ /dashboard/packages

diff --git a/package.json b/package.json
@@ -40,7 +40,6 @@
   },
   "resolutions": {
     "@adobe/css-tools": "^4.3.2",
-    "@kubernetes/client-node": "^0.22.1",
     "@hapi/hoek": "^10.0.1",
     "axios": "^1.7.4",
     "braces": "^3.0.3",

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "@devfile/api": "2.3.0-1721400636",
-    "@kubernetes/client-node": "^0.21.0",
+    "@kubernetes/client-node": "^0.22.1",
     "@types/jest": "^29.5.3",
     "@typescript-eslint/eslint-plugin": "^6.3.0",
     "@typescript-eslint/parser": "^6.3.0",

diff --git a/packages/dashboard-backend/package.json b/packages/dashboard-backend/package.json
@@ -37,7 +37,7 @@
     "@fastify/swagger": "^8.14.0",
     "@fastify/swagger-ui": "3.0.0",
     "@fastify/websocket": "^10.0.1",
-    "@kubernetes/client-node": "^0.21.0",
+    "@kubernetes/client-node": "^0.22.1",
     "args": "^5.0.3",
     "axios": "^1.7.0",
     "fastify": "^4.27.0",

diff --git a/packages/dashboard-frontend/package.json b/packages/dashboard-frontend/package.json
@@ -70,7 +70,7 @@
   "devDependencies": {
     "@devfile/api": "2.3.0-1721400636",
     "@eclipse-che/api": "^7.86.0",
-    "@kubernetes/client-node": "^0.21.0",
+    "@kubernetes/client-node": "^0.22.1",
     "@react-mock/state": "^0.1.8",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.5.0",

diff --git a/scripts/yarn/change_package_manager.sh b/scripts/yarn/change_package_manager.sh
@@ -32,16 +32,6 @@ if [ -f "$(pwd)/.yarnrc.yml" ]; then
     mv -f $(pwd)/.yarnrc.yml $TMP_DIR
 fi
 
-if [ -f "$(pwd)/.yarnrc" ]; then
-    echo "[INFO]: Move '.yarnrc' file to the temporary directory"
-    mv -f $(pwd)/.yarnrc $TMP_DIR
-fi
-
-if [ -d "$(pwd)/.yarn" ]; then
-    echo "[INFO]: Move '.yarn' dir to the temporary directory"
-    mv -f $(pwd)/.yarn $TMP_DIR/
-fi
-
 if [ -f "$(pwd)/yarn.lock" ]; then
     echo "[INFO]: Move 'yarn.lock' file to the temporary directory"
     mv -f $(pwd)/yarn.lock $TMP_DIR