From c74d79ae11eb921873fcff81eefe45ec4a074ea6 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sat, 24 Feb 2018 23:38:07 -0500 Subject: Docker updates for local AppImage build --- appimage/Dockerfile | 2 +- appimage/entrypoint | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'appimage') diff --git a/appimage/Dockerfile b/appimage/Dockerfile index d0efc672..174cdc98 100644 --- a/appimage/Dockerfile +++ b/appimage/Dockerfile @@ -3,7 +3,7 @@ RUN apt-get update && \ apt-get -y install screen autoconf git \ build-essential zlib1g-dev libjpeg-dev \ docbook-xsl fop xsltproc \ - imagemagick wget fuse && \ + inkscape busybox wget fuse && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* COPY entrypoint /entrypoint diff --git a/appimage/entrypoint b/appimage/entrypoint index 458a3acf..39c2ab61 100755 --- a/appimage/entrypoint +++ b/appimage/entrypoint @@ -1,5 +1,8 @@ #!/bin/bash set -e +if [ "$SKIP_TESTS" = "1" ]; then + touch /tmp/skip-tests +fi if [ $(id -u) = 0 ]; then if [ ! -d /tmp/build/.gnupg ]; then echo "/tmp/build must exist and must contain .gnupg" @@ -19,4 +22,7 @@ if [ ! -d qpdf ]; then git clone "$@" qpdf fi cd qpdf +if [ -f /tmp/skip-tests ]; then + export SKIP_TESTS=1 +fi ./appimage/build-appimage --sign -- cgit v1.2.3-54-g00ecf