Docker updates for local AppImage build

Jay Berkenbilt
1 parent 1e8b11c3
Showing 3 changed files with 13 additions and 1 deletions
README-maintainer
appimage/Dockerfile
appimage/entrypoint
@@ -134,6 +134,12 @@ mkdir -p /tmp/build
 cp -rLp ~/.gnupg/. /tmp/build/.gnupg
 docker run --privileged -ti --rm -v /tmp/build:/tmp/build qpdfbuild https://github.com/jberkenbilt/qpdf -b work
  
+  To build locally, omit the git arguments after qpdfbuild above and
+  copy the source tree into /tmp/build/qpdf.
+
+  Pass -e SKIP_TESTS=1 to docker to skip the test suite, useful for
+  rapid iteration.
+
   Rename the AppImage in /tmp/build/qpdf/appimage/build
   qpdf-$version-x86_64.AppImage and move it to the release archive
   area.
@@ -3,7 +3,7 @@ RUN apt-get update &amp;&amp; \
     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
 #!/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