From 8b0cf00ee0f7e92744087812de2d50092847c263 Mon Sep 17 00:00:00 2001
From: Kristofer <kristofer@andes.is>
Date: Wed, 20 Nov 2024 18:26:16 +0000
Subject: [PATCH] Reapply "chore(infra): Upgrade helm build yarn (#16890)"
 (#16967)

This reverts commit 0885426e09ab5901751b7d6b3a96696c19975ceb.
---
 infra/package.json       | 10 +++++++++-
 infra/scripts/Dockerfile |  2 +-
 infra/yarn.lock          | 10 ++++++++++
 package.json             |  4 ++--
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/infra/package.json b/infra/package.json
index 37b440fdd44c..dbfdeacf444d 100644
--- a/infra/package.json
+++ b/infra/package.json
@@ -2,6 +2,12 @@
   "name": "infra",
   "version": "1.0.0",
   "main": "index.js",
+  "engines": {
+    "npm": "please-use-yarn",
+    "node": "20.15.0",
+    "yarn": "3.2"
+  },
+  "packageManager": "yarn@3.2.3",
   "scripts": {
     "test": "jest",
     "charts": "node -r esbuild-register src/cli/generate-chart-values.ts",
@@ -27,6 +33,7 @@
   "dependencies": {
     "@aws-sdk/client-ssm": "3.145.0",
     "@types/lodash": "4.14.160",
+    "@types/yargs": "17.0.33",
     "aws-sdk": "^2.1003.0",
     "glob": "10.3.3",
     "json-refs": "3.0.15",
@@ -36,6 +43,7 @@
     "yargs": "17.7.2"
   },
   "volta": {
-    "node": "18.12.1"
+    "node": "20.15.0",
+    "yarn": "3.2.3"
   }
 }
diff --git a/infra/scripts/Dockerfile b/infra/scripts/Dockerfile
index 3bfaf486eef5..d47b4582d2aa 100644
--- a/infra/scripts/Dockerfile
+++ b/infra/scripts/Dockerfile
@@ -12,7 +12,7 @@ ENV NODE_OPTIONS=--openssl-legacy-provider
 
 COPY infra/package.json infra/yarn.lock /app/infra/
 COPY .yarn/ ./.yarn
-RUN yarn install --immutable
+RUN ls -lah && id && pwd && cat package.json && corepack enable && yarn install --immutable
 
 COPY infra/ /app/infra/
 COPY apps /app/apps/
diff --git a/infra/yarn.lock b/infra/yarn.lock
index 97bc475a7bec..4245c86f4f9a 100644
--- a/infra/yarn.lock
+++ b/infra/yarn.lock
@@ -3808,6 +3808,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/yargs@npm:17.0.33":
+  version: 17.0.33
+  resolution: "@types/yargs@npm:17.0.33"
+  dependencies:
+    "@types/yargs-parser": "*"
+  checksum: ee013f257472ab643cb0584cf3e1ff9b0c44bca1c9ba662395300a7f1a6c55fa9d41bd40ddff42d99f5d95febb3907c9ff600fbcb92dadbec22c6a76de7e1236
+  languageName: node
+  linkType: hard
+
 "@types/yargs@npm:^15.0.0":
   version: 15.0.11
   resolution: "@types/yargs@npm:15.0.11"
@@ -6681,6 +6690,7 @@ __metadata:
     "@types/js-yaml": 3.12.5
     "@types/lodash": 4.14.160
     "@types/node": 14.14.14
+    "@types/yargs": 17.0.33
     "@zeit/ncc": 0.22.3
     aws-sdk: ^2.1003.0
     esbuild: 0.14.39
diff --git a/package.json b/package.json
index 3ddf329e55c0..99b7f45c26ea 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "node": "20.15.0",
     "yarn": "3.2"
   },
+  "packageManager": "yarn@3.2.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/island-is/island.is.git"
@@ -505,6 +506,5 @@
   "volta": {
     "node": "20.15.0",
     "yarn": "3.2.3"
-  },
-  "packageManager": "yarn@3.2.3"
+  }
 }