diff --git a/CHANGES b/CHANGES index 2f36f140b..2e0055685 100644 --- a/CHANGES +++ b/CHANGES @@ -939,3 +939,6 @@ * Add html version of the digest email * Fix issue where collectd was collecting information about devicemapper mounts +[1.5.0] +* Update node to 6.11.2 + diff --git a/baseimage/initializeBaseUbuntuImage.sh b/baseimage/initializeBaseUbuntuImage.sh index c5597a7ea..4454b2f97 100644 --- a/baseimage/initializeBaseUbuntuImage.sh +++ b/baseimage/initializeBaseUbuntuImage.sh @@ -46,10 +46,10 @@ apt-get -y install \ cp /usr/share/unattended-upgrades/20auto-upgrades /etc/apt/apt.conf.d/20auto-upgrades echo "==> Installing node.js" -mkdir -p /usr/local/node-6.11.1 -curl -sL https://nodejs.org/dist/v6.11.1/node-v6.11.1-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-6.11.1 -ln -sf /usr/local/node-6.11.1/bin/node /usr/bin/node -ln -sf /usr/local/node-6.11.1/bin/npm /usr/bin/npm +mkdir -p /usr/local/node-6.11.2 +curl -sL https://nodejs.org/dist/v6.11.2/node-v6.11.2-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-6.11.2 +ln -sf /usr/local/node-6.11.2/bin/node /usr/bin/node +ln -sf /usr/local/node-6.11.2/bin/npm /usr/bin/npm apt-get install -y 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/createReleaseTarball b/scripts/createReleaseTarball index 8cdc01e27..d533b2ab3 100755 --- a/scripts/createReleaseTarball +++ b/scripts/createReleaseTarball @@ -31,8 +31,8 @@ if ! $(cd "${SOURCE_DIR}" && git diff --exit-code >/dev/null); then exit 1 fi -if [[ "$(node --version)" != "v6.11.1" ]]; then - echo "This script requires node 6.11.1" +if [[ "$(node --version)" != "v6.11.2" ]]; then + echo "This script requires node 6.11.2" exit 1 fi diff --git a/scripts/installer.sh b/scripts/installer.sh index 9c15f912b..bb2fdb5a1 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -35,12 +35,12 @@ while true; do done echo "==> installer: updating node" -if [[ "$(node --version)" != "v6.11.1" ]]; then - mkdir -p /usr/local/node-6.11.1 - $curl -sL https://nodejs.org/dist/v6.11.1/node-v6.11.1-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-6.11.1 - ln -sf /usr/local/node-6.11.1/bin/node /usr/bin/node - ln -sf /usr/local/node-6.11.1/bin/npm /usr/bin/npm - rm -rf /usr/local/node-6.9.2 +if [[ "$(node --version)" != "v6.11.2" ]]; then + mkdir -p /usr/local/node-6.11.2 + $curl -sL https://nodejs.org/dist/v6.11.2/node-v6.11.2-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-6.11.2 + ln -sf /usr/local/node-6.11.2/bin/node /usr/bin/node + ln -sf /usr/local/node-6.11.2/bin/npm /usr/bin/npm + rm -rf /usr/local/node-6.11.1 fi for try in `seq 1 10`; do