diff options
| author | LawnCable <lawncable.gitlab@simonlaux.de> | 2019-01-12 02:25:37 +0100 |
|---|---|---|
| committer | LawnCable <lawncable.gitlab@simonlaux.de> | 2019-01-12 02:25:37 +0100 |
| commit | 18b1fb3920de1f58ebff4399a8ae064fa92dbf7b (patch) | |
| tree | 834ac663ecd66a075ebc7c1d8e4265eac367ae91 | |
| parent | f5697ef5df709f2325b3954f3abe7c06e30f24d1 (diff) | |
| download | appimg-builder-18b1fb3920de1f58ebff4399a8ae064fa92dbf7b.tar.gz appimg-builder-18b1fb3920de1f58ebff4399a8ae064fa92dbf7b.tar.bz2 appimg-builder-18b1fb3920de1f58ebff4399a8ae064fa92dbf7b.tar.xz appimg-builder-18b1fb3920de1f58ebff4399a8ae064fa92dbf7b.zip | |
make it possible to run the thing on local docker, too
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | Dockerfile | 23 | ||||
| -rw-r--r-- | build.sh | 4 | ||||
| -rw-r--r-- | install_dependencies.sh | 8 |
4 files changed, 31 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19f4b5b..60d5971 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ BuildAppImage: - cd /builds/mana-launcher/mplusbuilder - chmod +x build.sh - chmod +x linuxdeploy-x86_64.AppImage + - ./linuxdeploy-x86_64.AppImage --appimage-extract - ./build.sh - cd - find / -type f -name "*.AppImage" diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..e2482c0 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,23 @@ +# Use an official Python runtime as a parent image +FROM ubuntu:trusty + +WORKDIR /app + +COPY install_dependencies.sh /app + +COPY . /app/local + +RUN apt-get update -qq + +RUN chmod +x install_dependencies.sh + +RUN chmod +x ./local/linuxdeploy-x86_64.AppImage + +RUN ./local/linuxdeploy-x86_64.AppImage --appimage-extract + +RUN mv squashfs-root ./local/squashfs-root + +RUN ./install_dependencies.sh + +# optionaly make the local build script executable +RUN chmod +x /app/local/build.sh @@ -20,12 +20,14 @@ cd manaplus-master dir=`pwd` autoreconf -i + ./configure --prefix=$dir/run \ --enable-commandlinepassword \ --datadir=$dir/run/share/games \ --bindir=$dir/run/bin \ --mandir=$dir/run/share/man \ --enable-portable=yes + cd po make update-gmo -j4 cd .. @@ -35,7 +37,7 @@ make install # package -../../linuxdeploy-x86_64.AppImage --appdir appDir \ +../../squashfs-root/AppRun --appdir appDir \ -d ../../manaplus.desktop \ -i ./data/icons/manaplus.svg \ -e ./run/bin/manaplus \ diff --git a/install_dependencies.sh b/install_dependencies.sh index 67a0f43..bb9d57f 100644 --- a/install_dependencies.sh +++ b/install_dependencies.sh @@ -7,10 +7,10 @@ apt-get install -y wget # manaplus sh -c 'echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> /etc/apt/sources.list' -apt-get update -y -apt-get -y build-dep manaplus +apt-get update -y -q +apt-get -y -q build-dep manaplus -apt-get install -y g++ gcc xsel make autoconf automake appstream-index libappstream0 libappstream-dev autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gdb valgrind netcat-openbsd procps zlibc +apt-get install -y -q g++ gcc xsel make autoconf automake appstream-index libappstream0 libappstream-dev autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gdb valgrind netcat-openbsd procps zlibc # AppImage - linuxdeploy -apt-get install -y libfuse2
\ No newline at end of file +#apt-get install -y -q libfuse2
\ No newline at end of file |