Compare commits

...

8 Commits
6.4.0 ... 6.4.3

Author SHA1 Message Date
Julien Neuhart
e6a5f4b203 Merge pull request #303 from thecodingmachine/missing-fonts
Add missing fonts from 6.4.1
2021-04-15 09:50:36 +02:00
Julien Neuhart
061b2fdbcb Remove font duplicate 2021-04-15 09:37:57 +02:00
Julien Neuhart
7922e32618 Add missing fonts from 6.4.1 2021-04-15 09:34:12 +02:00
Julien Neuhart
0949d10da6 Merge pull request #296 from bendavies/reduce-docker-image-size
Reduce the docker image size
2021-03-31 10:53:29 +02:00
Ben Davies
0c8ad9262e use only curl 2021-03-30 20:30:43 +01:00
Ben Davies
f841aef82d install ttf-mscorefonts-installer 3.8 2021-03-30 20:29:55 +01:00
Ben Davies
d42e51315d Delete the apt-get lists after installing something.
https://github.com/hadolint/hadolint/wiki/DL3009
2021-03-30 18:00:10 +01:00
Ben Davies
e761b73cfd Avoid additional packages by specifying --no-install-recommends.
https://github.com/hadolint/hadolint/wiki/DL3015
2021-03-30 18:00:06 +01:00

View File

@@ -6,10 +6,17 @@ FROM debian:buster-slim
# | # |
# | Libraries used in the build process of this image. # | Libraries used in the build process of this image.
# | # |
RUN apt-get update &&\
apt-get --no-install-recommends install -y ca-certificates curl gnupg procps &&\
rm -rf /var/lib/apt/lists/*
RUN echo "deb http://httpredir.debian.org/debian/ buster main contrib non-free" > /etc/apt/sources.list &&\ # |--------------------------------------------------------------------------
apt-get update &&\ # | Microsoft font installer
apt-get install -y curl wget gnupg ttf-mscorefonts-installer procps # |--------------------------------------------------------------------------
RUN apt-get update &&\
curl -o ./ttf-mscorefonts-installer_3.8_all.deb http://httpredir.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb &&\
apt --no-install-recommends install -y ./ttf-mscorefonts-installer_3.8_all.deb && rm ./ttf-mscorefonts-installer_3.8_all.deb &&\
rm -rf /var/lib/apt/lists/*
# |-------------------------------------------------------------------------- # |--------------------------------------------------------------------------
# | Chrome # | Chrome
@@ -17,11 +24,11 @@ RUN echo "deb http://httpredir.debian.org/debian/ buster main contrib non-free"
# | # |
# | Installs Chrome. # | Installs Chrome.
# | # |
RUN curl https://dl.google.com/linux/linux_signing_key.pub | apt-key add - &&\
RUN wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - &&\
echo "deb http://dl.google.com/linux/chrome/deb/ stable main" | tee /etc/apt/sources.list.d/google-chrome.list &&\ echo "deb http://dl.google.com/linux/chrome/deb/ stable main" | tee /etc/apt/sources.list.d/google-chrome.list &&\
apt-get update &&\ apt-get update &&\
apt-get -y --allow-unauthenticated install google-chrome-stable apt-get install --no-install-recommends -y --allow-unauthenticated google-chrome-stable &&\
rm -rf /var/lib/apt/lists/*
# |-------------------------------------------------------------------------- # |--------------------------------------------------------------------------
# | LibreOffice # | LibreOffice
@@ -34,7 +41,8 @@ RUN wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add
RUN mkdir -p /usr/share/man/man1mkdir -p /usr/share/man/man1 &&\ RUN mkdir -p /usr/share/man/man1mkdir -p /usr/share/man/man1 &&\
echo "deb http://httpredir.debian.org/debian/ buster-backports main contrib non-free" >> /etc/apt/sources.list &&\ echo "deb http://httpredir.debian.org/debian/ buster-backports main contrib non-free" >> /etc/apt/sources.list &&\
apt-get update &&\ apt-get update &&\
apt-get -t buster-backports -y install libreoffice apt-get --no-install-recommends -t buster-backports -y install libreoffice &&\
rm -rf /var/lib/apt/lists/*
# |-------------------------------------------------------------------------- # |--------------------------------------------------------------------------
# | Unoconv # | Unoconv
@@ -60,7 +68,7 @@ RUN curl -Ls $UNO_URL -o /usr/bin/unoconv &&\
ARG PDFTK_VERSION=924565150 ARG PDFTK_VERSION=924565150
RUN wget -O /usr/bin/pdftk "https://gitlab.com/pdftk-java/pdftk/-/jobs/${PDFTK_VERSION}/artifacts/raw/build/native-image/pdftk" \ RUN curl -o /usr/bin/pdftk "https://gitlab.com/pdftk-java/pdftk/-/jobs/${PDFTK_VERSION}/artifacts/raw/build/native-image/pdftk" \
&& chmod a+x /usr/bin/pdftk && chmod a+x /usr/bin/pdftk
# |-------------------------------------------------------------------------- # |--------------------------------------------------------------------------
@@ -74,7 +82,8 @@ RUN wget -O /usr/bin/pdftk "https://gitlab.com/pdftk-java/pdftk/-/jobs/${PDFTK_V
# Credits: # Credits:
# https://github.com/arachnys/athenapdf/blob/master/cli/Dockerfile # https://github.com/arachnys/athenapdf/blob/master/cli/Dockerfile
# https://help.accusoft.com/PrizmDoc/v12.1/HTML/Installing_Asian_Fonts_on_Ubuntu_and_Debian.html # https://help.accusoft.com/PrizmDoc/v12.1/HTML/Installing_Asian_Fonts_on_Ubuntu_and_Debian.html
RUN apt-get install -y \ RUN apt-get update &&\
apt-get install --no-install-recommends -y \
culmus \ culmus \
fonts-beng \ fonts-beng \
fonts-hosny-amiri \ fonts-hosny-amiri \
@@ -89,12 +98,25 @@ RUN apt-get install -y \
fonts-sil-padauk \ fonts-sil-padauk \
fonts-telu \ fonts-telu \
fonts-thai-tlwg \ fonts-thai-tlwg \
fonts-liberation \
ttf-wqy-zenhei \ ttf-wqy-zenhei \
fonts-arphic-uming \ fonts-arphic-uming \
fonts-ipafont-mincho \ fonts-ipafont-mincho \
fonts-ipafont-gothic \ fonts-ipafont-gothic \
fonts-unfonts-core fonts-unfonts-core \
# LibreOffice recommends.
fonts-crosextra-caladea \
fonts-crosextra-carlito \
fonts-dejavu \
fonts-dejavu-extra \
fonts-liberation \
fonts-liberation2 \
fonts-linuxlibertine \
fonts-noto-core \
fonts-noto-mono \
fonts-noto-ui-core \
fonts-sil-gentium \
fonts-sil-gentium-basic &&\
rm -rf /var/lib/apt/lists/*
COPY build/base/fonts/* /usr/local/share/fonts/ COPY build/base/fonts/* /usr/local/share/fonts/
COPY build/base/fonts.conf /etc/fonts/conf.d/100-gotenberg.conf COPY build/base/fonts.conf /etc/fonts/conf.d/100-gotenberg.conf