Update node to latest stable version (#12049)

* Update node to latest stable version - v10 has reached EOL so upgrading node to v14 which is the latest stable build * Added changelog * Resolve merge conflicts
hashicorp · Jul 22, 2021 · e8bcb69 · e8bcb69
1 parent e9f0413
commit e8bcb69
Show file tree

Hide file tree

Showing 11 changed files with 861 additions and 858 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.circleci/config/@build-release.yml b/.circleci/config/@build-release.yml
diff --git a/.circleci/config/executors/@executors.yml b/.circleci/config/executors/@executors.yml
@@ -9,7 +9,7 @@ go-machine:
   working_directory: /go/src/github.com/hashicorp/vault
 node:
   docker:
-    - image: docker.mirror.hashicorp.services/node:10-buster
+    - image: docker.mirror.hashicorp.services/node:14-buster
   shell: /usr/bin/env bash -euo pipefail -c
   working_directory: /go/src/github.com/hashicorp/vault
 python:

diff --git a/changelog/12049.txt b/changelog/12049.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: Updated node to v14, latest stable build
+```
diff --git a/packages-oss.lock/layers/layers.mk b/packages-oss.lock/layers/layers.mk
diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml
diff --git a/packages-oss.yml b/packages-oss.yml
@@ -226,7 +226,7 @@ layers:
       WORKDIR $DIR
   - name: install-yarn
     dockerfile: |-
-      RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+      RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
       RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
       RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
       RUN apt-get update -y && apt-get install -y -q nodejs yarn={{.YARN_VERSION}} \

diff --git a/scripts/cross/Dockerfile b/scripts/cross/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get update -y && apt-get install --no-install-recommends -y -q \
                          libltdl-dev \
                          libltdl7
 
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
 RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 

diff --git a/scripts/docker/Dockerfile.ui b/scripts/docker/Dockerfile.ui
@@ -20,7 +20,7 @@ RUN apt-get update -y && apt-get install --no-install-recommends -y -q \
                          libltdl-dev \
                          libltdl7
 
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
 RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 

diff --git a/ui/.nvmrc b/ui/.nvmrc
@@ -1 +1 @@
-v10
+v14
diff --git a/ui/package.json b/ui/package.json
@@ -189,7 +189,7 @@
     "xmlhttprequest-ssl": "^1.6.2"
   },
   "engines": {
-    "node": "10.* || >= 12"
+    "node": "14.*"
   },
   "ember": {
     "edition": "octane"