From d48bff31f6ae88c347554d60c5211e02287d6815 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Fri, 25 Aug 2017 09:45:51 +0900
Subject: [PATCH] Fix for fuse in docker
---
.travis.yml | 8 +-------
pkg/appimage/appimage.sh | 6 +++---
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index b0a948f..8b9aeb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,15 +7,9 @@ branches:
only:
- master
-before_install:
- - sudo apt-get install -qq pkg-config fuse
- - sudo modprobe fuse
- - sudo chmod 666 /dev/fuse
- - sudo chown root:$USER /etc/fuse.conf
-
script:
- mntdir='/mnt/ocs-manager'
#- docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh snap"
#- docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh flatpak"
- - docker run --rm -v $(pwd):${mntdir} --cap-add SYS_ADMIN --device /dev/fuse ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh appimage"
+ - docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh appimage"
- cat transfer.log
diff --git a/pkg/appimage/appimage.sh b/pkg/appimage/appimage.sh
index b176ca7..b50dc53 100644
--- a/pkg/appimage/appimage.sh
+++ b/pkg/appimage/appimage.sh
@@ -1,13 +1,13 @@
#!/bin/sh
sh scripts/import.sh
-
qmake PREFIX="/usr"
make
make INSTALL_ROOT="ocs-manager.AppDir" install
curl -L -o linuxdeployqt.AppImage "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
chmod 755 linuxdeployqt.AppImage
+./linuxdeployqt.AppImage --appimage-extract
-./linuxdeployqt.AppImage ocs-manager.AppDir/usr/share/applications/ocs-manager.desktop -bundle-non-qt-libs -no-translations
-./linuxdeployqt.AppImage ocs-manager.AppDir/usr/share/applications/ocs-manager.desktop -appimage
+./squashfs-root/AppRun ocs-manager.AppDir/usr/share/applications/ocs-manager.desktop -bundle-non-qt-libs -no-translations
+./squashfs-root/AppRun ocs-manager.AppDir/usr/share/applications/ocs-manager.desktop -appimage
--
GitLab