remove mounting of /dev/fuse for linux builds
Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
parent
a1aeff70e5
commit
ff3a54e9e3
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue