Merge branch 'nodejs-update' into 'master'

Nodejs update

See merge request !25

docker/Dockerfile_centos6

@@ -63,7 +63,7 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
 ENV BUNDLER_VERSION 1.13.6
 RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
-ENV NODE_VERSION 6.9.4
+ENV NODE_VERSION 6.9.5
 RUN RPM_TMP=$(mktemp) \
   && curl -sL -o '${RPM_TMP}' 'https://rpm.nodesource.com/pub_6.x/el/6/x86_64/nodesource-release-el6-1.noarch.rpm' \
   && rpm -i --nosignature --force '${RPM_TMP}' \

docker/Dockerfile_centos7

@@ -63,7 +63,7 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
 ENV BUNDLER_VERSION 1.13.6
 RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
-ENV NODE_VERSION 6.9.4
+ENV NODE_VERSION 6.9.5
 RUN RPM_TMP=$(mktemp) \
   && curl -sL -o '${RPM_TMP}' 'https://rpm.nodesource.com/pub_6.x/el/7/x86_64/nodesource-release-el7-1.noarch.rpm' \
   && rpm -i --nosignature --force '${RPM_TMP}' \

docker/Dockerfile_jessie

@@ -67,7 +67,7 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
 ENV BUNDLER_VERSION 1.13.6
 RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
-ENV NODE_VERSION 6.9.4
+ENV NODE_VERSION 6.9.5
 RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
   && echo 'deb https://deb.nodesource.com/node_6.x jessie main' > /etc/apt/sources.list.d/nodesource.list \
   && echo 'deb-src https://deb.nodesource.com/node_6.x jessie main' >> /etc/apt/sources.list.d/nodesource.list \

docker/Dockerfile_precise

@@ -69,7 +69,7 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
 ENV BUNDLER_VERSION 1.13.6
 RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
-ENV NODE_VERSION 6.9.4
+ENV NODE_VERSION 6.9.5
 RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
   && echo 'deb https://deb.nodesource.com/node_6.x precise main' > /etc/apt/sources.list.d/nodesource.list \
   && echo 'deb-src https://deb.nodesource.com/node_6.x precise main' >> /etc/apt/sources.list.d/nodesource.list \

docker/Dockerfile_rpi_jessie

@@ -78,7 +78,7 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
 ENV BUNDLER_VERSION 1.13.6
 RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
-ENV NODE_VERSION 6.9.4
+ENV NODE_VERSION 6.9.5
 RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
   && echo 'deb https://deb.nodesource.com/node_6.x jessie main' > /etc/apt/sources.list.d/nodesource.list \
   && echo 'deb-src https://deb.nodesource.com/node_6.x jessie main' >> /etc/apt/sources.list.d/nodesource.list \

docker/Dockerfile_rpi_wheezy

@@ -78,12 +78,10 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
 ENV BUNDLER_VERSION 1.13.6
 RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
-ENV NODE_VERSION 6.9.4
-RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-  && echo 'deb https://deb.nodesource.com/node_6.x wheezy main' > /etc/apt/sources.list.d/nodesource.list \
-  && echo 'deb-src https://deb.nodesource.com/node_6.x wheezy main' >> /etc/apt/sources.list.d/nodesource.list \
-  && apt-get update -q \
-  && DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends nodejs=${NODE_VERSION}-*
+ENV NODE_VERSION 6.9.5
+RUN curl -fsSL "https://nodejs.org/dist/latest-v6.x/node-v${NODE_VERSION}-linux-armv6l.tar.gz" \
+  | tar -xzC /usr/local \
+  && ln -sf /usr/local/node-v${NODE_VERSION}-linux-armv6l/bin/node /usr/local/node-v${NODE_VERSION}-linux-armv6l/bin/npm /usr/local/bin/
 RUN mkdir -p /opt/gitlab /var/cache/omnibus ~/.ssh

docker/Dockerfile_trusty

@@ -67,7 +67,7 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
 ENV BUNDLER_VERSION 1.13.6
 RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
-ENV NODE_VERSION 6.9.4
+ENV NODE_VERSION 6.9.5
 RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
   && echo 'deb https://deb.nodesource.com/node_6.x trusty main' > /etc/apt/sources.list.d/nodesource.list \
   && echo 'deb-src https://deb.nodesource.com/node_6.x trusty main' >> /etc/apt/sources.list.d/nodesource.list \

docker/Dockerfile_wheezy

@@ -67,7 +67,7 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
 ENV BUNDLER_VERSION 1.13.6
 RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
-ENV NODE_VERSION 6.9.4
+ENV NODE_VERSION 6.9.5
 RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
   && echo 'deb https://deb.nodesource.com/node_6.x wheezy main' > /etc/apt/sources.list.d/nodesource.list \
   && echo 'deb-src https://deb.nodesource.com/node_6.x wheezy main' >> /etc/apt/sources.list.d/nodesource.list \

docker/Dockerfile_xenial

@@ -68,7 +68,7 @@ RUN /usr/local/bin/gem update --system ${RUBYGEMS_VERSION} --no-ri --no-rdoc
 ENV BUNDLER_VERSION 1.13.6
 RUN /usr/local/bin/gem install bundler --version ${BUNDLER_VERSION} --no-ri --no-rdoc
-ENV NODE_VERSION 6.9.4
+ENV NODE_VERSION 6.9.5
 RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
   && echo 'deb https://deb.nodesource.com/node_6.x xenial main' > /etc/apt/sources.list.d/nodesource.list \
   && echo 'deb-src https://deb.nodesource.com/node_6.x xenial main' >> /etc/apt/sources.list.d/nodesource.list \