Commit 122921ba authored by ShareLaTeX's avatar ShareLaTeX
Browse files

Merge branch 'master' of https://github.com/sharelatex/sharelatex-docker-image 

Conflicts:
	settings.coffee
parents 3dbe92ce 10b6f88f

Dockerfile

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 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 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

logrotate/sharelatex

0 → 100644
+9 −0
Original line number Diff line number Diff line 
/var/log/sharelatex/*.log {

  daily

  missingok

  rotate 5

  compress

  copytruncate

  notifempty

  create 644 root adm

}
 
 No newline at end of file

services.js

+4 −0
Original line number Diff line number Diff line
@@ -40,4 +40,8 @@ module.exports = 
	name: "spelling",

	repo: "https://github.com/sharelatex/spelling-sharelatex.git",

	version: "master"

}, {

	name: "contacts",

	repo: "https://github.com/sharelatex/contacts-sharelatex.git",

	version: "master"

}]