From 3c431008ddf4837c403d102a23116cdb33b7f80c Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Tue, 21 Feb 2017 11:22:25 +0000 Subject: [PATCH] split base image from main image --- server-ce/Dockerfile | 50 ++++----------------------------------- server-ce/Dockerfile-base | 41 ++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 46 deletions(-) create mode 100644 server-ce/Dockerfile-base diff --git a/server-ce/Dockerfile b/server-ce/Dockerfile index b8ca0a0360..2e688a0c55 100644 --- a/server-ce/Dockerfile +++ b/server-ce/Dockerfile @@ -1,58 +1,18 @@ -FROM phusion/baseimage:0.9.16 +FROM sharelatex-base-image -ENV baseDir . - -RUN apt-get update -RUN curl -sL https://deb.nodesource.com/setup | sudo bash - -RUN apt-get install -y build-essential wget nodejs 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-de-alt 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-no aspell-nr aspell-ns aspell-or aspell-pa aspell-pl aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sl aspell-ss aspell-st aspell-sv aspell-ta aspell-te aspell-tl aspell-tn aspell-ts aspell-uk aspell-uz aspell-xh aspell-zu - -ADD ${baseDir}/logrotate/sharelatex /etc/logrotate.d/sharelatex - -WORKDIR /opt -RUN wget https://s3.amazonaws.com/sharelatex-random-files/qpdf-6.0.0.tar.gz && tar xzf qpdf-6.0.0.tar.gz -WORKDIR /opt/qpdf-6.0.0 -RUN ./configure && make && make install && ldconfig - -# Install ShareLaTeX settings file +# Install sharelatex settings file ADD ${baseDir}/settings.coffee /etc/sharelatex/settings.coffee ENV SHARELATEX_CONFIG /etc/sharelatex/settings.coffee -# 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; \ - rm -rf /usr/local/texlive/2016/texmf-dist/doc/ - -RUN rm -r /install-tl-unx; \ - rm install-tl-unx.tar.gz - -ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/texlive/2016/bin/x86_64-linux/ -RUN tlmgr install latexmk -RUN tlmgr install texcount - -RUN npm install -g grunt-cli - -# Set up sharelatex user and home directory -RUN adduser --system --group --home /var/www/sharelatex --no-create-home sharelatex; \ - mkdir -p /var/lib/sharelatex; \ - chown www-data:www-data /var/lib/sharelatex; \ - mkdir -p /var/log/sharelatex; \ - chown www-data:www-data /var/log/sharelatex; \ - mkdir -p /var/lib/sharelatex/data/template_files; \ - chown www-data:www-data /var/lib/sharelatex/data/template_files; - - ADD ${baseDir}/runit /etc/service RUN rm /etc/nginx/sites-enabled/default ADD ${baseDir}/nginx/nginx.conf /etc/nginx/nginx.conf ADD ${baseDir}/nginx/sharelatex.conf /etc/nginx/sites-enabled/sharelatex.conf -COPY ${baseDir}/init_scripts/ /etc/my_init.d/ +ADD ${baseDir}/logrotate/sharelatex /etc/logrotate.d/sharelatex +COPY ${baseDir}/init_scripts/ /etc/my_init.d/ # Install ShareLaTeX RUN git clone https://github.com/sharelatex/sharelatex.git /var/www/sharelatex #random_change @@ -78,8 +38,6 @@ RUN cd /var/www/sharelatex/web; \ RUN cd /var/www/sharelatex/clsi; \ grunt compile:bin - - EXPOSE 80 WORKDIR / diff --git a/server-ce/Dockerfile-base b/server-ce/Dockerfile-base new file mode 100644 index 0000000000..55c69e0aa5 --- /dev/null +++ b/server-ce/Dockerfile-base @@ -0,0 +1,41 @@ +# Sharelatex Base Image + +FROM phusion/baseimage:0.9.16 + +ENV baseDir . + +RUN apt-get update +RUN curl -sL https://deb.nodesource.com/setup | sudo bash - +RUN apt-get install -y build-essential wget nodejs 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-de-alt 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-no aspell-nr aspell-ns aspell-or aspell-pa aspell-pl aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sl aspell-ss aspell-st aspell-sv aspell-ta aspell-te aspell-tl aspell-tn aspell-ts aspell-uk aspell-uz aspell-xh aspell-zu + +WORKDIR /opt +RUN wget https://s3.amazonaws.com/sharelatex-random-files/qpdf-6.0.0.tar.gz && tar xzf qpdf-6.0.0.tar.gz +WORKDIR /opt/qpdf-6.0.0 +RUN ./configure && make && make install && ldconfig + +# 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 + +RUN rm -r /install-tl-unx; \ + rm install-tl-unx.tar.gz + +ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/texlive/2016/bin/x86_64-linux/ +RUN tlmgr install latexmk +RUN tlmgr install texcount + +RUN npm install -g grunt-cli + +# Set up sharelatex user and home directory +RUN adduser --system --group --home /var/www/sharelatex --no-create-home sharelatex; \ + mkdir -p /var/lib/sharelatex; \ + chown www-data:www-data /var/lib/sharelatex; \ + mkdir -p /var/log/sharelatex; \ + chown www-data:www-data /var/log/sharelatex; \ + mkdir -p /var/lib/sharelatex/data/template_files; \ + chown www-data:www-data /var/lib/sharelatex/data/template_files; +