diff options
| -rwxr-xr-x | .ci/linux/create-packages.sh | 4 | ||||
| -rw-r--r-- | Dockerfile.debian | 22 | ||||
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | README.md | 3 |
4 files changed, 36 insertions, 0 deletions
diff --git a/.ci/linux/create-packages.sh b/.ci/linux/create-packages.sh index 8da5249e..37c21612 100755 --- a/.ci/linux/create-packages.sh +++ b/.ci/linux/create-packages.sh @@ -19,6 +19,10 @@ if [[ $TAG == nightly ]]; then TAG=${TRAVIS_BUILD_NUMBER}.nightly fi +if [ -z "$TAG" ]; then + TAG=`git rev-parse --abbrev-ref HEAD` +fi + # Installing dependencies on travis. if [ ! -z "$TRAVIS_OS_NAME" ]; then sudo apt-add-repository -y ppa:brightbox/ruby-ng diff --git a/Dockerfile.debian b/Dockerfile.debian new file mode 100644 index 00000000..5ecaecc7 --- /dev/null +++ b/Dockerfile.debian @@ -0,0 +1,22 @@ +FROM debian:unstable + +RUN apt-get update -y -qq + +RUN apt-get install -y gcc g++ cmake clang liblmdb-dev + +RUN apt-get install -y mesa-common-dev wget fuse git + +RUN apt-get -y install ruby ruby-dev rubygems rpm && \ + gem install --no-ri --no-rdoc fpm + +RUN apt-get update -qq && \ + apt-get install -y \ + qt5-default \ + qtbase5-dev \ + qttools5-dev-tools \ + qttools5-dev \ + qtmultimedia5-dev + +RUN mkdir /build + +WORKDIR /build diff --git a/Makefile b/Makefile index 053e40c4..a63a228f 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,9 @@ lint: image: docker build -t nheko-app-image . +debian-image: + docker build -f Dockerfile.debian -t nheko-debian-appimage . + linux-deploy: ./.ci/linux/deploy.sh ./.ci/linux/create-packages.sh @@ -40,5 +43,9 @@ docker-app-image: image --privileged \ -v `pwd`:/build nheko-app-image make linux-deploy +docker-debian-appimage: debian-image + docker run -v `pwd`:/build nheko-debian-appimage make release + docker run --privileged -v `pwd`:/build nheko-debian-appimage make linux-deploy + clean: rm -rf build diff --git a/README.md b/README.md index e43cd944..4e20cfca 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,9 @@ If you don't want to install any external dependencies, you can generate an AppI make docker-app-image ``` +If you're on Debian you should use `make docker-debian-appimage` instead, which uses +Debian as the build host in an attempt to work around this [issue](https://github.com/AppImage/AppImageKit/wiki/Desktop-Linux-Platform-Issues#openssl). + ##### Arch Linux ```bash |