diff --git a/CHANGES b/CHANGES index 2b5e65e51..e98e67d93 100644 --- a/CHANGES +++ b/CHANGES @@ -2194,4 +2194,5 @@ [6.2.0] * ovh: object storage URL has changed from s3 to storage subdomain * ionos: add profit bricks object storage +* update node to 14.15.4 diff --git a/baseimage/initializeBaseUbuntuImage.sh b/baseimage/initializeBaseUbuntuImage.sh index 426c0816f..5288bb917 100755 --- a/baseimage/initializeBaseUbuntuImage.sh +++ b/baseimage/initializeBaseUbuntuImage.sh @@ -72,10 +72,11 @@ apt-get -o Dpkg::Options::="--force-confold" install -y --no-install-recommends cp /usr/share/unattended-upgrades/20auto-upgrades /etc/apt/apt.conf.d/20auto-upgrades echo "==> Installing node.js" -mkdir -p /usr/local/node-10.18.1 -curl -sL https://nodejs.org/dist/v10.18.1/node-v10.18.1-linux-x64.tar.gz | tar zxf - --strip-components=1 -C /usr/local/node-10.18.1 -ln -sf /usr/local/node-10.18.1/bin/node /usr/bin/node -ln -sf /usr/local/node-10.18.1/bin/npm /usr/bin/npm +readonly node_version=14.15.4 +mkdir -p /usr/local/node-${node_version} +curl -sL https://nodejs.org/dist/v${node_version}/node-v${node_version}-linux-x64.tar.gz | tar zxf - --strip-components=1 -C /usr/local/node-${node_version} +ln -sf /usr/local/node-${node_version}/bin/node /usr/bin/node +ln -sf /usr/local/node-${node_version}/bin/npm /usr/bin/npm apt-get install -y --no-install-recommends python # Install python which is required for npm rebuild [[ "$(python --version 2>&1)" == "Python 2.7."* ]] || die "Expecting python version to be 2.7.x" diff --git a/scripts/installer.sh b/scripts/installer.sh index 4df04128a..87b63373b 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -71,12 +71,13 @@ apt remove -y gnome-shell || true apt -y autoremove || true echo "==> installer: updating node" -if [[ "$(node --version)" != "v10.18.1" ]]; then - mkdir -p /usr/local/node-10.18.1 - $curl -sL https://nodejs.org/dist/v10.18.1/node-v10.18.1-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-10.18.1 - ln -sf /usr/local/node-10.18.1/bin/node /usr/bin/node - ln -sf /usr/local/node-10.18.1/bin/npm /usr/bin/npm - rm -rf /usr/local/node-10.15.1 +readonly node_version=14.15.4 +if [[ "$(node --version)" != "v${node_version}" ]]; then + mkdir -p /usr/local/node-${node_version} + $curl -sL https://nodejs.org/dist/v${node_version}/node-v${node_version}-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-${node_version} + ln -sf /usr/local/node-${node_version}/bin/node /usr/bin/node + ln -sf /usr/local/node-${node_version}/bin/npm /usr/bin/npm + rm -rf /usr/local/node-10.18.1 fi # this is here (and not in updater.js) because rebuild requires the above node