Skip to content
Snippets Groups Projects
Commit fb0507c8 authored by Martin Jeppesen's avatar Martin Jeppesen
Browse files

Rearrange Dockerfile

parent cb927036
Branches
No related tags found
No related merge requests found
......@@ -3,13 +3,9 @@ FROM ubuntu:18.04
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get -qq update && apt-get -qq -y upgrade
RUN apt-get -qq -y install build-essential wget unzip time imagemagick optipng strace nginx git python zlib1g-dev libpcre3-dev \
aspell aspell-en aspell-da \
supervisor
# nodejs grunt node-grunt-cli npm supervisor
RUN apt-get -y install tzdata
supervisor tzdata
ARG TZ=Europe/Copenhagen
RUN cp /usr/share/zoneinfo/$TZ /etc/localtime
......@@ -20,6 +16,7 @@ RUN wget https://s3.amazonaws.com/sharelatex-random-files/qpdf-6.0.0.tar.gz && \
tar xzf qpdf-6.0.0.tar.gz && cd qpdf-6.0.0 && \
./configure && make && make install && ldconfig
## Install NVM
# Replace shell with bash so we can source files
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
......@@ -28,16 +25,8 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
# Install base dependencies
RUN apt-get -qq -y install --no-install-recommends \
apt-transport-https \
build-essential \
ca-certificates \
curl \
git \
libssl-dev \
wget
#ENV NVM_DIR /root/.nvm
#ENV NODE_VERSION 6.14.3
apt-transport-https ca-certificates curl libssl-dev
ENV NODE_VERSION 6.13.1
# Install nvm with node and npm
......@@ -56,40 +45,44 @@ ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
RUN npm install -g grunt-cli
RUN apt-get -qq -y install texlive-base texlive-binaries texlive-latex-base texlive-latex-recommended texlive texlive-bibtex-extra \
texlive-fonts-extra texlive-fonts-extra-links texlive-fonts-recommended texlive-formats-extra \
texlive-generic-extra texlive-generic-recommended texlive-lang-english texlive-lang-european \
texlive-latex-extra texlive-pictures texlive-plain-generic texlive-pstricks texlive-science
texlive-latex-extra texlive-pictures texlive-plain-generic texlive-pstricks texlive-science latexmk
#RUN apt-get -qq -y install r-base r-base-dev xorg xorg-dev r-cran-rgl libxml2-dev libcurl4-gnutls-dev \
# r-cran-rjava default-jre ed libssl-dev
RUN apt-get -y install latexmk
RUN git clone https://github.com/sharelatex/sharelatex.git /var/www/sharelatex && \
rm -rf /var/www/sharelatex/.git
#RUN git clone https://github.com/sharelatex/sharelatex.git /var/www/sharelatex && \
# rm -rf /var/www/sharelatex/.git
COPY www.tar.gz /
RUN rm -rf /var/www && cd /var && tar xzf /www.tar.gz && rm -rf /www.tar.gz
#COPY www.tar.gz /
#RUN rm -rf /var/www && cd /var && tar xzf /www.tar.gz && rm -rf /www.tar.gz
COPY setup*.sh /
#RUN /setup-r.sh
RUN /setup-paths.sh
#COPY config/services.js /var/www/sharelatex/config/
#COPY config/package.json /var/www/
#COPY config/git-revision.js /var/www/
COPY config/settings.coffee /etc/sharelatex/
RUN /setup-crypto.sh
# override so sk-update-mongojs branch is used for contacts-sharelatex
COPY config/services.js /var/www/sharelatex/config/
COPY config/settings.coffee /etc/sharelatex/
ENV SHARELATEX_CONFIG /etc/sharelatex/settings.coffee
RUN /setup-crypto.sh
COPY config/package.json /var/www/
RUN cd /var/www && npm install
# What is the purpose of this?
COPY config/git-revision.js /var/www/
# Grunt: git clone the many repos
RUN cd /var/www/sharelatex; \
npm install; \
npm instaill; \
grunt install
RUN exit 1
# Fixes https://github.com/sharelatex/document-updater-sharelatex/pull/61
#COPY config/Gruntfile.coffee /var/www/sharelatex/document-updater/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment