diff options
author | Jay Berkenbilt <ejb@ql.org> | 2022-03-12 02:54:48 +0100 |
---|---|---|
committer | Jay Berkenbilt <jberkenbilt@users.noreply.github.com> | 2022-03-19 00:53:18 +0100 |
commit | 1b85faa61abcec253f9fb5aab6f94c844e4df816 (patch) | |
tree | a4950664fd2c4942e348cf8e37791e79b3a4c9bc /appimage/Dockerfile | |
parent | 3a902ad20afd385955e0d094d00bf7f385b1c3f0 (diff) | |
download | qpdf-1b85faa61abcec253f9fb5aab6f94c844e4df816.tar.zst |
Convert AppImage build to use cmake
Diffstat (limited to 'appimage/Dockerfile')
-rw-r--r-- | appimage/Dockerfile | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/appimage/Dockerfile b/appimage/Dockerfile index 0b7232f9..da0b8b72 100644 --- a/appimage/Dockerfile +++ b/appimage/Dockerfile @@ -1,13 +1,28 @@ -FROM ubuntu:18.04 +FROM ubuntu:18.04 as start ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update && \ - apt-get -y install screen autoconf git sudo \ - build-essential zlib1g-dev libjpeg-dev libgnutls28-dev \ - python3-pip texlive-latex-extra latexmk \ - inkscape imagemagick busybox-static wget fuse && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* +RUN apt-get update +RUN apt-get -y install screen git sudo \ + build-essential pkg-config \ + zlib1g-dev libjpeg-dev libgnutls28-dev \ + python3-pip texlive-latex-extra latexmk \ + inkscape imagemagick busybox-static wget fuse + +# Until we move to ubuntu:20.04, we need a newer cmake. After 20.04, +# we can remove this and add cmake to the install above. +RUN apt-get -y install software-properties-common wget +RUN wget -O /etc/apt/trusted.gpg.d/kitware.asc \ + https://apt.kitware.com/keys/kitware-archive-latest.asc +RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' +RUN apt-get update +RUN apt-get -y install cmake +# End cmake + +RUN apt-get clean && rm -rf /var/lib/apt/lists/* + RUN pip3 install sphinx sphinx_rtd_theme + +FROM ubuntu:18.04 as run +COPY --from=start / / COPY entrypoint /entrypoint RUN chmod +x /entrypoint ENTRYPOINT [ "/entrypoint" ] |