From 507a3fbeaa4a9c7427731d56d0295e262a9761b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 5 Dec 2018 21:02:37 +0100 Subject: [PATCH] bump nodejs version on desktop build docker images to 10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- ci/Jenkinsfile.linux | 2 +- ci/Jenkinsfile.macos | 1 + ci/Jenkinsfile.windows | 2 +- desktop/docker/linux/Dockerfile | 8 +++++--- desktop/docker/linux/Makefile | 3 ++- desktop/docker/windows/Dockerfile | 8 +++++--- desktop/docker/windows/Makefile | 5 +++-- 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux index 362314ad66..51c2e3ec5c 100644 --- a/ci/Jenkinsfile.linux +++ b/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 "+ diff --git a/ci/Jenkinsfile.macos b/ci/Jenkinsfile.macos index 712150b5d3..4424682245 100644 --- a/ci/Jenkinsfile.macos +++ b/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 { diff --git a/ci/Jenkinsfile.windows b/ci/Jenkinsfile.windows index 7ae707a82d..35d70356de 100644 --- a/ci/Jenkinsfile.windows +++ b/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 "+ diff --git a/desktop/docker/linux/Dockerfile b/desktop/docker/linux/Dockerfile index 7c18eb6b8d..b778cb3a39 100644 --- a/desktop/docker/linux/Dockerfile +++ b/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." \ diff --git a/desktop/docker/linux/Makefile b/desktop/docker/linux/Makefile index 52a77eb774..88ca0aaabf 100644 --- a/desktop/docker/linux/Makefile +++ b/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) diff --git a/desktop/docker/windows/Dockerfile b/desktop/docker/windows/Dockerfile index b8cb474e32..4014bc7533 100644 --- a/desktop/docker/windows/Dockerfile +++ b/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." \ diff --git a/desktop/docker/windows/Makefile b/desktop/docker/windows/Makefile index ef42ef0e9c..59ded7f6a2 100644 --- a/desktop/docker/windows/Makefile +++ b/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 \