mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-21 20:47:08 -05:00
[misc] minimize base image (#120)
* [docker] drop sudo Signed-off-by: Jakob Ackermann <das7pad@outlook.com> * [docker] install qpdf in a single stage Signed-off-by: Jakob Ackermann <das7pad@outlook.com> * [docker] install texlive and additional tlmgr packages in a single stage Signed-off-by: Jakob Ackermann <das7pad@outlook.com> * [docker] drop the apt package lists Signed-off-by: Jakob Ackermann <das7pad@outlook.com> * [docker] pull the package lists only once move the installation of nodejs into the dependencies install section Signed-off-by: Jakob Ackermann <das7pad@outlook.com> * [docker] delete the default nginx configuration files immediately Signed-off-by: Jakob Ackermann <das7pad@outlook.com> * [docker] skip the downloading and storage of unused texlive artifacts Signed-off-by: Jakob Ackermann <das7pad@outlook.com> * [docker] drop the npm download cache Signed-off-by: Jakob Ackermann <das7pad@outlook.com> * [docker] apply review feedback - install qpdf as ubuntu package - add a comment on the nginx config removal - add back and update a note on changing the texlive mirror
This commit is contained in:
Jakob Ackermann
GitHub
parent
991cb29d0b
commit
ac82600b74
2 changed files with 45 additions and 34 deletions
|
|
@ -56,7 +56,6 @@ ADD ${baseDir}/runit /etc/service
|
||||||
|
|
||||||
# Configure nginx
|
# Configure nginx
|
||||||
# ---------------
|
# ---------------
|
||||||
RUN rm /etc/nginx/sites-enabled/default
|
|
||||||
ADD ${baseDir}/nginx/nginx.conf /etc/nginx/nginx.conf
|
ADD ${baseDir}/nginx/nginx.conf /etc/nginx/nginx.conf
|
||||||
ADD ${baseDir}/nginx/sharelatex.conf /etc/nginx/sites-enabled/sharelatex.conf
|
ADD ${baseDir}/nginx/sharelatex.conf /etc/nginx/sites-enabled/sharelatex.conf
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,47 +9,59 @@ ENV baseDir .
|
||||||
|
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
# --------------------
|
# --------------------
|
||||||
RUN apt-get update
|
RUN apt-get update \
|
||||||
RUN apt-get install -y sudo
|
&& apt-get install -y \
|
||||||
RUN apt-get install -y build-essential wget net-tools unzip time imagemagick optipng strace nginx git python zlib1g-dev libpcre3-dev aspell aspell-en aspell-af aspell-am aspell-ar aspell-ar-large aspell-bg aspell-bn aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-gu aspell-he aspell-hi aspell-hr aspell-hsb aspell-hu aspell-hy aspell-id aspell-is aspell-it aspell-kk aspell-kn aspell-ku aspell-lt aspell-lv aspell-ml aspell-mr aspell-nl aspell-nr aspell-ns aspell-pa aspell-pl aspell-pt aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sl aspell-ss aspell-st aspell-sv aspell-tl aspell-tn aspell-ts aspell-uk aspell-uz aspell-xh aspell-zu
|
build-essential wget net-tools unzip time imagemagick optipng strace nginx git python zlib1g-dev libpcre3-dev \
|
||||||
|
qpdf \
|
||||||
|
aspell aspell-en aspell-af aspell-am aspell-ar aspell-ar-large aspell-bg aspell-bn aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-gu aspell-he aspell-hi aspell-hr aspell-hsb aspell-hu aspell-hy aspell-id aspell-is aspell-it aspell-kk aspell-kn aspell-ku aspell-lt aspell-lv aspell-ml aspell-mr aspell-nl aspell-nr aspell-ns aspell-pa aspell-pl aspell-pt aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sl aspell-ss aspell-st aspell-sv aspell-tl aspell-tn aspell-ts aspell-uk aspell-uz aspell-xh aspell-zu \
|
||||||
|
\
|
||||||
|
# install Node.JS 10
|
||||||
|
&& curl -sSL https://deb.nodesource.com/setup_10.x | bash - \
|
||||||
|
&& apt-get install -y nodejs \
|
||||||
|
\
|
||||||
|
&& rm -rf \
|
||||||
|
# We are adding a custom nginx config in the main Dockerfile.
|
||||||
|
/etc/nginx/nginx.conf \
|
||||||
|
/etc/nginx/sites-enabled/default \
|
||||||
|
/var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Install Grunt
|
||||||
# Install qpdf
|
|
||||||
# ------------
|
# ------------
|
||||||
WORKDIR /opt
|
RUN npm install -g \
|
||||||
RUN wget https://s3.amazonaws.com/sharelatex-random-files/qpdf-6.0.0.tar.gz && tar xzf qpdf-6.0.0.tar.gz
|
grunt-cli \
|
||||||
WORKDIR /opt/qpdf-6.0.0
|
&& rm -rf /root/.npm
|
||||||
RUN ./configure && make && make install && ldconfig
|
|
||||||
|
|
||||||
|
|
||||||
# Install Node
|
|
||||||
# ------------
|
|
||||||
RUN curl -sL https://deb.nodesource.com/setup_10.x | sudo bash -
|
|
||||||
RUN apt-get install -y nodejs
|
|
||||||
RUN npm install -g grunt-cli
|
|
||||||
|
|
||||||
# Install TexLive
|
# Install TexLive
|
||||||
# ---------------
|
# ---------------
|
||||||
RUN wget http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz && \
|
|
||||||
mkdir /install-tl-unx && \
|
|
||||||
tar -xvf install-tl-unx.tar.gz -C /install-tl-unx --strip-components=1
|
|
||||||
RUN echo "selected_scheme scheme-basic" >> /install-tl-unx/texlive.profile && \
|
|
||||||
/install-tl-unx/install-tl -profile /install-tl-unx/texlive.profile
|
|
||||||
|
|
||||||
# CTAN mirrors occasionally fail, in that case install TexLive against an
|
# CTAN mirrors occasionally fail, in that case install TexLive against an
|
||||||
# specific server, for example http://ctan.crest.fr
|
# specific server, for example http://ctan.crest.fr
|
||||||
# RUN wget http://ctan.crest.fr/tex-archive/systems/texlive/tlnet/install-tl-unx.tar.gz && \
|
#
|
||||||
# mkdir /install-tl-unx && \
|
# # docker build \
|
||||||
# tar -xvf install-tl-unx.tar.gz -C /install-tl-unx --strip-components=1
|
# --build-arg TEXLIVE_MIRROR=http://ctan.crest.fr/tex-archive/systems/texlive/tlnet \
|
||||||
# RUN echo "selected_scheme scheme-basic" >> /install-tl-unx/texlive.profile && \
|
# -f Dockerfile-base -t sharelatex/sharelatex-base .
|
||||||
# /install-tl-unx/install-tl -profile /install-tl-unx/texlive.profile \
|
ARG TEXLIVE_MIRROR=http://mirror.ctan.org/systems/texlive/tlnet
|
||||||
# -repository http://ctan.crest.fr/tex-archive/systems/texlive/tlnet/
|
|
||||||
|
|
||||||
RUN rm -r /install-tl-unx; \
|
ENV PATH "${PATH}:/usr/local/texlive/2019/bin/x86_64-linux"
|
||||||
rm install-tl-unx.tar.gz
|
|
||||||
ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/texlive/2019/bin/x86_64-linux/
|
RUN mkdir /install-tl-unx \
|
||||||
RUN tlmgr install latexmk
|
&& curl -sSL \
|
||||||
RUN tlmgr install texcount
|
${TEXLIVE_MIRROR}/install-tl-unx.tar.gz \
|
||||||
|
| tar -xzC /install-tl-unx --strip-components=1 \
|
||||||
|
\
|
||||||
|
&& echo "tlpdbopt_autobackup 0" >> /install-tl-unx/texlive.profile \
|
||||||
|
&& echo "tlpdbopt_install_docfiles 0" >> /install-tl-unx/texlive.profile \
|
||||||
|
&& echo "tlpdbopt_install_srcfiles 0" >> /install-tl-unx/texlive.profile \
|
||||||
|
&& echo "selected_scheme scheme-basic" >> /install-tl-unx/texlive.profile \
|
||||||
|
\
|
||||||
|
&& /install-tl-unx/install-tl \
|
||||||
|
-profile /install-tl-unx/texlive.profile \
|
||||||
|
-repository ${TEXLIVE_MIRROR} \
|
||||||
|
\
|
||||||
|
&& tlmgr install --repository ${TEXLIVE_MIRROR} \
|
||||||
|
latexmk \
|
||||||
|
texcount \
|
||||||
|
\
|
||||||
|
&& rm -rf /install-tl-unx
|
||||||
|
|
||||||
|
|
||||||
# Set up sharelatex user and home directory
|
# Set up sharelatex user and home directory
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue