From feb6252fae2b21c63a3c71faf07c984a32128eb1 Mon Sep 17 00:00:00 2001
From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com>
Date: Sat, 11 Feb 2023 13:25:07 +0300
Subject: [PATCH] [macOS] Update templates to fix issue with node 19 (#7081)

---
 images/macos/provision/core/node.sh          | 2 +-
 images/macos/templates/macOS-11.anka.pkr.hcl | 2 +-
 images/macos/templates/macOS-11.json         | 2 +-
 images/macos/templates/macOS-12.anka.pkr.hcl | 2 +-
 images/macos/templates/macOS-12.json         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/images/macos/provision/core/node.sh b/images/macos/provision/core/node.sh
index f98113fc0042..ae6145861a31 100644
--- a/images/macos/provision/core/node.sh
+++ b/images/macos/provision/core/node.sh
@@ -5,7 +5,7 @@ defaultVersion=$(get_toolset_value '.node.default')
 
 echo "Installing Node.js $defaultVersion"
 brew_smart_install "node@$defaultVersion"
-brew link node@$defaultVersion --force
+brew link node@$defaultVersion --force --overwrite
 
 echo Installing yarn...
 curl -o- -L https://yarnpkg.com/install.sh | bash
diff --git a/images/macos/templates/macOS-11.anka.pkr.hcl b/images/macos/templates/macOS-11.anka.pkr.hcl
index dcb0fd0bcfdc..444df522fc78 100644
--- a/images/macos/templates/macOS-11.anka.pkr.hcl
+++ b/images/macos/templates/macOS-11.anka.pkr.hcl
@@ -172,6 +172,7 @@ build {
       "./provision/core/ruby.sh",
       "./provision/core/rubygem.sh",
       "./provision/core/git.sh",
+      "./provision/core/mongodb.sh",
       "./provision/core/node.sh",
       "./provision/core/commonutils.sh",
     ]
@@ -214,7 +215,6 @@ build {
       "./provision/core/apache.sh",
       "./provision/core/nginx.sh",
       "./provision/core/postgresql.sh",
-      "./provision/core/mongodb.sh",
       "./provision/core/audiodevice.sh",
       "./provision/core/vcpkg.sh",
       "./provision/core/miniconda.sh",
diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json
index 164db86262db..510391438ffb 100644
--- a/images/macos/templates/macOS-11.json
+++ b/images/macos/templates/macOS-11.json
@@ -157,6 +157,7 @@
                 "./provision/core/ruby.sh",
                 "./provision/core/rubygem.sh",
                 "./provision/core/git.sh",
+                "./provision/core/mongodb.sh",
                 "./provision/core/node.sh"
             ],
             "environment_vars": [
@@ -201,7 +202,6 @@
                 "./provision/core/apache.sh",
                 "./provision/core/nginx.sh",
                 "./provision/core/postgresql.sh",
-                "./provision/core/mongodb.sh",
                 "./provision/core/audiodevice.sh",
                 "./provision/core/vcpkg.sh",
                 "./provision/core/miniconda.sh",
diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl
index b92bd0642b9e..06bfe81a4709 100644
--- a/images/macos/templates/macOS-12.anka.pkr.hcl
+++ b/images/macos/templates/macOS-12.anka.pkr.hcl
@@ -173,6 +173,7 @@ build {
       "./provision/core/ruby.sh",
       "./provision/core/rubygem.sh",
       "./provision/core/git.sh",
+      "./provision/core/mongodb.sh",
       "./provision/core/node.sh",
       "./provision/core/commonutils.sh"
     ]
@@ -215,7 +216,6 @@ build {
       "./provision/core/apache.sh",
       "./provision/core/nginx.sh",
       "./provision/core/postgresql.sh",
-      "./provision/core/mongodb.sh",
       "./provision/core/audiodevice.sh",
       "./provision/core/vcpkg.sh",
       "./provision/core/miniconda.sh",
diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json
index 2ee5c7193394..0ca2661aab5f 100644
--- a/images/macos/templates/macOS-12.json
+++ b/images/macos/templates/macOS-12.json
@@ -157,6 +157,7 @@
                 "./provision/core/ruby.sh",
                 "./provision/core/rubygem.sh",
                 "./provision/core/git.sh",
+                "./provision/core/mongodb.sh",
                 "./provision/core/node.sh",
                 "./provision/core/commonutils.sh"
             ],
@@ -202,7 +203,6 @@
                 "./provision/core/apache.sh",
                 "./provision/core/nginx.sh",
                 "./provision/core/postgresql.sh",
-                "./provision/core/mongodb.sh",
                 "./provision/core/audiodevice.sh",
                 "./provision/core/vcpkg.sh",
                 "./provision/core/miniconda.sh",