bump nodejs version on desktop build docker images to 10

Signed-off-by: Jakub Sokołowski <jakub@status.im>

ci/Jenkinsfile.linux

@@ -3,7 +3,7 @@ pipeline {
     /* privileged mode is necessary for fuse */
     docker {
       label 'linux-new'
-      image 'statusteam/linux-desktop-ubuntu:qt-5.11.2'
+      image 'statusteam/linux-desktop-ubuntu:1.1.0'
       args (
         "--privileged "+
         "-v /dev/fuse:/dev/fuse "+

ci/Jenkinsfile.macos

@@ -21,6 +21,7 @@ pipeline {
     LC_ALL = 'en_US.UTF-8'
     QT_PATH = '/usr/local/opt/qt'
     PATH = "/usr/local/opt/qt/bin:${env.PATH}"
+    MACDEPLOYQT = '/usr/local/opt/qt/bin/macdeployqt'
   }
 
   stages {

ci/Jenkinsfile.windows

@@ -3,7 +3,7 @@ pipeline {
     /* privileged mode is necessary for fuse */
     docker {
       label 'linux-new'
-      image 'statusteam/windows-desktop-ubuntu:nsis-1.0.0'
+      image 'statusteam/windows-desktop-ubuntu:1.1.0'
       args (
         "--privileged "+
         "-v /dev/fuse:/dev/fuse "+

desktop/docker/linux/Dockerfile

@@ -40,7 +40,7 @@ ENV NPM_CONFIG_CACHE /var/tmp/npm
 ENV PATH /opt/qt/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 RUN apt-get update && apt-get -q -y --no-install-recommends install curl software-properties-common && \
-    curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
+    curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
     add-apt-repository -y ppa:longsleep/golang-backports && \
@@ -76,8 +76,10 @@ RUN cd /tmp && \
 RUN addgroup --gid 1002 jenkins && \
     adduser --shell /bin/bash \
       --disabled-password --gecos "" \
-      --uid 1001 --gid 1002 \
-      --home /var/tmp/jenkins jenkins
+      --uid 1001 --gid 1002 jenkins
+
+# Install NVM for Jenkins
+RUN su jenkins -c 'curl -s -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash'
 
 LABEL source="https://github.com/status-im/status-react/tree/develop/desktop/docker" \
       description="Image for building Linux Desktop version of Status app." \

desktop/docker/linux/Makefile

@@ -7,7 +7,8 @@ QT_ARCHIVE = qt-opensource-linux-x64-$(QT_VERSION).run
 QT_MD5SUM  = 974fda61267cfb6e45984ee5f0a285f8
 QT_URL = https://download.qt.io/archive/qt
 
-IMAGE_TAG = qt-$(QT_VERSION)
+# WARNING: Remember to change the tag when updating the image
+IMAGE_TAG = 1.1.0
 IMAGE_NAME = statusteam/linux-desktop-ubuntu:$(IMAGE_TAG)
 
 build: $(QT_ARCHIVE)

desktop/docker/windows/Dockerfile

@@ -10,7 +10,7 @@ ENV NPM_CONFIG_CACHE /var/tmp/npm
 ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 RUN apt-get update && apt-get -q -y --no-install-recommends install curl software-properties-common && \
-    curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
+    curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
     add-apt-repository -y ppa:longsleep/golang-backports && \
@@ -48,8 +48,10 @@ RUN cd /tmp && \
 RUN addgroup --gid 1002 jenkins && \
     adduser --shell /bin/bash \
       --disabled-password --gecos "" \
-      --uid 1001 --gid 1002 \
-      --home /var/tmp/jenkins jenkins
+      --uid 1001 --gid 1002 jenkins
+
+# Install NVM for Jenkins
+RUN su jenkins -c 'curl -s -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash'
 
 LABEL source="https://github.com/status-im/status-react/tree/develop/desktop/windows/docker" \
       description="Image for building Windows Desktop version of Status app." \

desktop/docker/windows/Makefile

@@ -1,7 +1,8 @@
 GIT_COMMIT = $(shell git rev-parse --short HEAD)
 
-IMAGE_TAG = 1.0.0
-IMAGE_NAME = statusteam/windows-desktop-ubuntu:nsis-$(IMAGE_TAG)
+# WARNING: Remember to change the tag when updating the image
+IMAGE_TAG = 1.1.0
+IMAGE_NAME = statusteam/windows-desktop-ubuntu:$(IMAGE_TAG)
 
 build:
 	docker build \