Commit c74d79ae11eb921873fcff81eefe45ec4a074ea6
1 parent
1e8b11c3
Docker updates for local AppImage build
Showing
3 changed files
with
13 additions
and
1 deletions
README-maintainer
| @@ -134,6 +134,12 @@ mkdir -p /tmp/build | @@ -134,6 +134,12 @@ mkdir -p /tmp/build | ||
| 134 | cp -rLp ~/.gnupg/. /tmp/build/.gnupg | 134 | cp -rLp ~/.gnupg/. /tmp/build/.gnupg |
| 135 | docker run --privileged -ti --rm -v /tmp/build:/tmp/build qpdfbuild https://github.com/jberkenbilt/qpdf -b work | 135 | docker run --privileged -ti --rm -v /tmp/build:/tmp/build qpdfbuild https://github.com/jberkenbilt/qpdf -b work |
| 136 | 136 | ||
| 137 | + To build locally, omit the git arguments after qpdfbuild above and | ||
| 138 | + copy the source tree into /tmp/build/qpdf. | ||
| 139 | + | ||
| 140 | + Pass -e SKIP_TESTS=1 to docker to skip the test suite, useful for | ||
| 141 | + rapid iteration. | ||
| 142 | + | ||
| 137 | Rename the AppImage in /tmp/build/qpdf/appimage/build | 143 | Rename the AppImage in /tmp/build/qpdf/appimage/build |
| 138 | qpdf-$version-x86_64.AppImage and move it to the release archive | 144 | qpdf-$version-x86_64.AppImage and move it to the release archive |
| 139 | area. | 145 | area. |
appimage/Dockerfile
| @@ -3,7 +3,7 @@ RUN apt-get update && \ | @@ -3,7 +3,7 @@ RUN apt-get update && \ | ||
| 3 | apt-get -y install screen autoconf git \ | 3 | apt-get -y install screen autoconf git \ |
| 4 | build-essential zlib1g-dev libjpeg-dev \ | 4 | build-essential zlib1g-dev libjpeg-dev \ |
| 5 | docbook-xsl fop xsltproc \ | 5 | docbook-xsl fop xsltproc \ |
| 6 | - imagemagick wget fuse && \ | 6 | + inkscape busybox wget fuse && \ |
| 7 | apt-get clean && \ | 7 | apt-get clean && \ |
| 8 | rm -rf /var/lib/apt/lists/* | 8 | rm -rf /var/lib/apt/lists/* |
| 9 | COPY entrypoint /entrypoint | 9 | COPY entrypoint /entrypoint |
appimage/entrypoint
| 1 | #!/bin/bash | 1 | #!/bin/bash |
| 2 | set -e | 2 | set -e |
| 3 | +if [ "$SKIP_TESTS" = "1" ]; then | ||
| 4 | + touch /tmp/skip-tests | ||
| 5 | +fi | ||
| 3 | if [ $(id -u) = 0 ]; then | 6 | if [ $(id -u) = 0 ]; then |
| 4 | if [ ! -d /tmp/build/.gnupg ]; then | 7 | if [ ! -d /tmp/build/.gnupg ]; then |
| 5 | echo "/tmp/build must exist and must contain .gnupg" | 8 | echo "/tmp/build must exist and must contain .gnupg" |
| @@ -19,4 +22,7 @@ if [ ! -d qpdf ]; then | @@ -19,4 +22,7 @@ if [ ! -d qpdf ]; then | ||
| 19 | git clone "$@" qpdf | 22 | git clone "$@" qpdf |
| 20 | fi | 23 | fi |
| 21 | cd qpdf | 24 | cd qpdf |
| 25 | +if [ -f /tmp/skip-tests ]; then | ||
| 26 | + export SKIP_TESTS=1 | ||
| 27 | +fi | ||
| 22 | ./appimage/build-appimage --sign | 28 | ./appimage/build-appimage --sign |