From ff3a54e9e3788eb61edfd08323ec71fe189e97a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Thu, 21 Feb 2019 16:38:58 +0100
Subject: [PATCH] remove mounting of /dev/fuse for linux builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ci/Jenkinsfile.linux     |  2 --
 scripts/build-desktop.sh | 12 +++++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux
index 98ba5bef1f..3ac4c281d9 100644
--- a/ci/Jenkinsfile.linux
+++ b/ci/Jenkinsfile.linux
@@ -6,8 +6,6 @@ pipeline {
       /* WARNING: remember to keep this up-to-date with the value in docker/linux/Makefile */
       image 'statusteam/status-build-linux:1.1.0-2a35dcde'
       args (
-        "--privileged "+
-        "-v /dev/fuse:/dev/fuse "+
         "-v /var/tmp/lein:/var/tmp/lein:rw "+
         "-v /var/tmp/npm:/var/tmp/npm:rw "+
         "-v /opt/desktop-files:/opt/desktop-files:rw"
diff --git a/scripts/build-desktop.sh b/scripts/build-desktop.sh
index e63cdf576c..22c0411682 100755
--- a/scripts/build-desktop.sh
+++ b/scripts/build-desktop.sh
@@ -79,11 +79,17 @@ function joinExistingPath() {
 STATUSREACTPATH="$(cd "$SCRIPTPATH" && cd '..' && pwd)"
 WORKFOLDER="$(joinExistingPath "$STATUSREACTPATH" 'StatusImPackage')"
 DEPLOYQTFNAME='linuxdeployqt-continuous-x86_64_20181215.AppImage'
-APPIMAGETOOLFNAME='appimagetool-x86_64_20181109.AppImage'
+APPIMAGETOOLFNAME='appimagetool-x86_64_20190221.AppImage'
 DEPLOYQT=$(joinPath . "$DEPLOYQTFNAME")
 APPIMAGETOOL=$(joinPath . "$APPIMAGETOOLFNAME")
 STATUSIM_APPIMAGE_ARCHIVE="StatusImAppImage_20181208.zip"
 
+APPIMAGE_OPTIONS=""
+if [[ ! -c /dev/fuse ]]; then # doesn't exist when run under docker
+    # We extract it to avoid having to use fuse and privileged mode in docker
+    APPIMAGE_OPTIONS="--appimage-extract-and-run"
+fi
+
 function init() {
   if [ -z $STATUSREACTPATH ]; then
     echo "${RED}STATUSREACTPATH environment variable is not defined!${NC}"
@@ -311,7 +317,7 @@ function bundleLinux() {
     rm -f $usrBinPath/Status.AppImage
   popd
 
-  $DEPLOYQT \
+  $DEPLOYQT $APPIMAGE_OPTIONS \
     $desktopFilePath \
     -verbose=$VERBOSE_LEVEL -always-overwrite -no-strip \
     -no-translations -bundle-non-qt-libs \
@@ -324,7 +330,7 @@ function bundleLinux() {
 
   pushd $WORKFOLDER
     rm -f $usrBinPath/Status.AppImage
-    $APPIMAGETOOL ./AppDir
+    $APPIMAGETOOL $APPIMAGE_OPTIONS ./AppDir
     [ $VERBOSE_LEVEL -ge 1 ] && ldd $usrBinPath/Status
     rm -rf Status.AppImage
   popd