octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-22 19:08:59 +00:00
Code Issues Releases Wiki Activity

Bump AppImage to Ubuntu 20.04

Browse Source 
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).
This commit is contained in:
Jay Berkenbilt 2023-05-05 06:47:59 -04:00
parent a69fea14ae
commit a6d7b79e65
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
appimage/Dockerfile
View File

@ -1,28 +1,13 @@
FROM ubuntu:18.04 as start FROM ubuntu:20.04
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update RUN apt-get update
RUN apt-get -y install screen git sudo \ RUN apt-get -y install screen git sudo \
build-essential pkg-config \ build-essential pkg-config cmake \
zlib1g-dev libjpeg-dev libgnutls28-dev \ zlib1g-dev libjpeg-dev libgnutls28-dev \
python3-pip texlive-latex-extra latexmk \ python3-pip texlive-latex-extra latexmk \
inkscape imagemagick busybox-static wget fuse inkscape imagemagick busybox-static wget fuse && \
apt-get clean && rm -rf /var/lib/apt/lists/*
# 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 RUN pip3 install sphinx sphinx_rtd_theme
FROM ubuntu:18.04 as run
COPY --from=start / /
COPY entrypoint /entrypoint COPY entrypoint /entrypoint
RUN chmod +x /entrypoint RUN chmod +x /entrypoint
ENTRYPOINT [ "/entrypoint" ] ENTRYPOINT [ "/entrypoint" ]

4
appimage/build-appimage
View File

@ -47,14 +47,14 @@ fi
_osversion=$(cat /etc/os-release | grep PRETTY_NAME | awk -F'=' '{print $2}' | sed 's#"##g') _osversion=$(cat /etc/os-release | grep PRETTY_NAME | awk -F'=' '{print $2}' | sed 's#"##g')
# Warn users building the AppImage locally: # Warn users building the AppImage locally:
if [[ ! $_osversion =~ Ubuntu\ 18.04.*\ LTS ]]; then if [[ ! $_osversion =~ Ubuntu\ 20.04.*\ LTS ]]; then
set +x set +x
echo "" echo ""
# 0 1 2 3 4 5 6 7 # 0 1 2 3 4 5 6 7
# 01234567890123456789012345678901234567890123456789012345678901234567890123456789 # 01234567890123456789012345678901234567890123456789012345678901234567890123456789
echo "+===========================================================================+" echo "+===========================================================================+"
echo "|| WARNING: You are about to build a QPDF AppImage on a system which is ||" echo "|| WARNING: You are about to build a QPDF AppImage on a system which is ||"
echo "|| NOT Ubuntu 18.04 LTS. ||" echo "|| NOT Ubuntu 20.04 LTS. ||"
echo "|| ||" echo "|| ||"
echo "|| It is recommended that you use a distribution that is at least a ||" echo "|| It is recommended that you use a distribution that is at least a ||"
echo "|| few years old to maximize the number of Linux distributions the ||" echo "|| few years old to maximize the number of Linux distributions the ||"