status-im/status-mobile
2
0
Fork 0
mirror of https://github.com/status-im/status-mobile.git synced 2025-01-27 08:55:39 +00:00
Code Issues Projects Releases Wiki Activity

remove mounting of /dev/fuse for linux builds

Browse Source 
Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2019-02-21 16:38:58 +01:00
parent a1aeff70e5
commit ff3a54e9e3
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/Jenkinsfile.linux
View File

@ -6,8 +6,6 @@ pipeline {
/* WARNING: remember to keep this up-to-date with the value in docker/linux/Makefile */ /* WARNING: remember to keep this up-to-date with the value in docker/linux/Makefile */
image 'statusteam/status-build-linux:1.1.0-2a35dcde' image 'statusteam/status-build-linux:1.1.0-2a35dcde'
args ( args (
"--privileged "+
"-v /dev/fuse:/dev/fuse "+
"-v /var/tmp/lein:/var/tmp/lein:rw "+ "-v /var/tmp/lein:/var/tmp/lein:rw "+
"-v /var/tmp/npm:/var/tmp/npm:rw "+ "-v /var/tmp/npm:/var/tmp/npm:rw "+
"-v /opt/desktop-files:/opt/desktop-files:rw" "-v /opt/desktop-files:/opt/desktop-files:rw"

12
scripts/build-desktop.sh
View File

@ -79,11 +79,17 @@ function joinExistingPath() {
STATUSREACTPATH="$(cd "$SCRIPTPATH" && cd '..' && pwd)" STATUSREACTPATH="$(cd "$SCRIPTPATH" && cd '..' && pwd)"
WORKFOLDER="$(joinExistingPath "$STATUSREACTPATH" 'StatusImPackage')" WORKFOLDER="$(joinExistingPath "$STATUSREACTPATH" 'StatusImPackage')"
DEPLOYQTFNAME='linuxdeployqt-continuous-x86_64_20181215.AppImage' DEPLOYQTFNAME='linuxdeployqt-continuous-x86_64_20181215.AppImage'
APPIMAGETOOLFNAME='appimagetool-x86_64_20181109.AppImage' APPIMAGETOOLFNAME='appimagetool-x86_64_20190221.AppImage'
DEPLOYQT=$(joinPath . "$DEPLOYQTFNAME") DEPLOYQT=$(joinPath . "$DEPLOYQTFNAME")
APPIMAGETOOL=$(joinPath . "$APPIMAGETOOLFNAME") APPIMAGETOOL=$(joinPath . "$APPIMAGETOOLFNAME")
STATUSIM_APPIMAGE_ARCHIVE="StatusImAppImage_20181208.zip" 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() { function init() {
if [ -z $STATUSREACTPATH ]; then if [ -z $STATUSREACTPATH ]; then
echo "${RED}STATUSREACTPATH environment variable is not defined!${NC}" echo "${RED}STATUSREACTPATH environment variable is not defined!${NC}"
@ -311,7 +317,7 @@ function bundleLinux() {
rm -f $usrBinPath/Status.AppImage rm -f $usrBinPath/Status.AppImage
popd popd
$DEPLOYQT \ $DEPLOYQT $APPIMAGE_OPTIONS \
$desktopFilePath \ $desktopFilePath \
-verbose=$VERBOSE_LEVEL -always-overwrite -no-strip \ -verbose=$VERBOSE_LEVEL -always-overwrite -no-strip \
-no-translations -bundle-non-qt-libs \ -no-translations -bundle-non-qt-libs \
@ -324,7 +330,7 @@ function bundleLinux() {
pushd $WORKFOLDER pushd $WORKFOLDER
rm -f $usrBinPath/Status.AppImage rm -f $usrBinPath/Status.AppImage
$APPIMAGETOOL ./AppDir $APPIMAGETOOL $APPIMAGE_OPTIONS ./AppDir
[ $VERBOSE_LEVEL -ge 1 ] && ldd $usrBinPath/Status [ $VERBOSE_LEVEL -ge 1 ] && ldd $usrBinPath/Status
rm -rf Status.AppImage rm -rf Status.AppImage
popd popd