OpenSystemsDevelopment / qpdf

Commit a6d7b79e65941238871c0c3d7d06b9bf246213ba

Authored by Jay Berkenbilt
1 parent a69fea14

Bump AppImage to Ubuntu 20.04 

18.04 is out of security support, and cmake for 18.04 is no longer
available via kitware's debian repository (or at least fetching it
failed for one build).
Inline Side-by-side
Showing 2 changed files with 6 additions and 21 deletions
appimage/Dockerfile
  View file @a6d7b79
1   -FROM ubuntu:18.04 as start
  1 +FROM ubuntu:20.04
2 2 ENV DEBIAN_FRONTEND=noninteractive
3 3 RUN apt-get update
4 4 RUN apt-get -y install screen git sudo \
5   - build-essential pkg-config \
  5 + build-essential pkg-config cmake \
6 6 zlib1g-dev libjpeg-dev libgnutls28-dev \
7 7 python3-pip texlive-latex-extra latexmk \
8   - inkscape imagemagick busybox-static wget fuse
9   -
10   -# Until we move to ubuntu:20.04, we need a newer cmake. After 20.04,
11   -# we can remove this and add cmake to the install above.
12   -RUN apt-get -y install software-properties-common wget
13   -RUN wget -O /etc/apt/trusted.gpg.d/kitware.asc \
14   - https://apt.kitware.com/keys/kitware-archive-latest.asc
15   -RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
16   -RUN apt-get update
17   -RUN apt-get -y install cmake
18   -# End cmake
19   -
20   -RUN apt-get clean && rm -rf /var/lib/apt/lists/*
21   -
  8 + inkscape imagemagick busybox-static wget fuse && \
  9 + apt-get clean && rm -rf /var/lib/apt/lists/*
22 10 RUN pip3 install sphinx sphinx_rtd_theme
23   -
24   -FROM ubuntu:18.04 as run
25   -COPY --from=start / /
26 11 COPY entrypoint /entrypoint
27 12 RUN chmod +x /entrypoint
28 13 ENTRYPOINT [ "/entrypoint" ]
... ...
appimage/build-appimage
  View file @a6d7b79
... ... @@ -47,14 +47,14 @@ fi
47 47 _osversion=$(cat /etc/os-release | grep PRETTY_NAME | awk -F'=' '{print $2}' | sed 's#"##g')
48 48  
49 49 # Warn users building the AppImage locally:
50   -if [[ ! $_osversion =~ Ubuntu\ 18.04.*\ LTS ]]; then
  50 +if [[ ! $_osversion =~ Ubuntu\ 20.04.*\ LTS ]]; then
51 51 set +x
52 52 echo ""
53 53 # 0 1 2 3 4 5 6 7
54 54 # 01234567890123456789012345678901234567890123456789012345678901234567890123456789
55 55 echo "+===========================================================================+"
56 56 echo "|| WARNING: You are about to build a QPDF AppImage on a system which is ||"
57   - echo "|| NOT Ubuntu 18.04 LTS. ||"
  57 + echo "|| NOT Ubuntu 20.04 LTS. ||"
58 58 echo "|| ||"
59 59 echo "|| It is recommended that you use a distribution that is at least a ||"
60 60 echo "|| few years old to maximize the number of Linux distributions the ||"
... ...