aboutsummaryrefslogtreecommitdiffstats
path: root/packer/provision
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2018-07-09 23:25:58 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2018-07-09 23:25:58 +0200
commit75899f9453f99e96f69789337aa7cc02452812e2 (patch)
tree90dff98e190803413d03d453b9507898bc998907 /packer/provision
parent6bda5cd4e1a95a6040356c41c947075c7319cde5 (diff)
Bump nodejs 8.x and npm 5.x
Default nodejs & npm are very old (nodejs 4.x and npm 3.x) and don't allow to build xds dashboard. Note that one reason to bump to a recent npm version (at least npm ^5.0.0) is the support of package-lock.json that is very useful to lock dependencies of nodejs packages in a project. (for more info see https://docs.npmjs.com/files/package-lock.json) Change-Id: I639b97ee12e9d11f47a09bf5443fb2470fbf485a Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
Diffstat (limited to 'packer/provision')
-rw-r--r--packer/provision/agl_dependencies.sh14
1 files changed, 6 insertions, 8 deletions
diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh
index 148e65ee..d26985c6 100644
--- a/packer/provision/agl_dependencies.sh
+++ b/packer/provision/agl_dependencies.sh
@@ -24,7 +24,7 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \
libsdl1.2-dev xterm make xsltproc docbook-utils fop dblatex xmlto autoconf automake \
libtool libglib2.0-dev libarchive-dev python-git git python python-minimal repo \
tree rsync python-yaml python-requests curl tar docker.io pandoc python3 \
- ruby-all-dev ruby-ffi ruby-ffi-* jekyll ruby-redcarpet npm mkdocs nodejs \
+ ruby-all-dev ruby-ffi ruby-ffi-* jekyll ruby-redcarpet mkdocs \
python-pip python-simplejson g++-multilib make zip unzip
DEBIAN_FRONTEND=noninteractive apt-get install -y -t jessie-backports lava-tool=0.19-1~bpo8+1
@@ -63,15 +63,13 @@ vm.dirty_writeback_centisecs = 0
EOFSYSCTL
-### webdocs
+### webdocs + xds
# taken from container setup script. not documented in readme.
-# install node.js and tools (npm, gulp, bower) if needed
+# install node.js and tools (npm, gulp, bower)
#
-if [[ -z $(which node) ]]; then
- curl -sL https://deb.nodesource.com/setup_6.x | bash -
- apt-get install -y nodejs
- npm install --global gulp bower
-fi
+curl -v --connect-timeout 60 --retry 3 -sL https://deb.nodesource.com/setup_8.x | bash -
+apt-get install -y nodejs npm
+npm install --global gulp bower
# tools used to generate developer website (https://github.com/automotive-grade-linux/docs-agl)
gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 \