From 9646654c481bfee3a504ab718e1b76fa47b2da21 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Fri, 27 May 2016 12:12:28 +0100
Subject: [PATCH] put apt-get installs on same line and set
 $TEX_LIVE_DOCKER_IMAGE via env var

---
 server-ce/Dockerfile      | 20 +++-----------------
 server-ce/settings.coffee |  2 +-
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/server-ce/Dockerfile b/server-ce/Dockerfile
index 9cfd8edc51..929528f274 100644
--- a/server-ce/Dockerfile
+++ b/server-ce/Dockerfile
@@ -4,10 +4,11 @@ ENV baseDir .
 
 RUN apt-get update
 RUN curl -sL https://deb.nodesource.com/setup | sudo bash -
-RUN apt-get install -y build-essential nodejs
+RUN apt-get install -y build-essential wget nodejs unzip time imagemagick optipng strace nginx git python zlib1g-dev; \
+ install -y 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 
+
 
 # Install TexLive
-RUN apt-get install -y wget
 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
@@ -18,23 +19,8 @@ RUN echo "selected_scheme scheme-basic" >> /install-tl-unx/texlive.profile; \
 # Install Node.js and Grunt
 RUN npm install -g grunt-cli
 
-# Install Aspell
-RUN apt-get install -y 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 
 
-# Install unzip for file uploads
-RUN apt-get install -y unzip
 
-# Install imagemagick for image conversions
-RUN apt-get install -y imagemagick optipng
-
-# zlib1g-dev is needed to compile the synctex binaries in the CLSI during `grunt install`.
-RUN apt-get install -y zlib1g-dev
-
-RUN apt-get install -y time
-RUN apt-get install -y strace
-RUN apt-get install -y nginx
-RUN apt-get install -y git
-RUN apt-get install -y python
 
 # Set up sharelatex user and home directory
 RUN adduser --system --group --home /var/www/sharelatex --no-create-home sharelatex; \
diff --git a/server-ce/settings.coffee b/server-ce/settings.coffee
index 2e2c738acb..f3066da8ed 100644
--- a/server-ce/settings.coffee
+++ b/server-ce/settings.coffee
@@ -494,7 +494,7 @@ if process.env["DOCKER_IN_DOCKER"] == "true"
 	settings.clsi =
 		commandRunner: "docker-runner-sharelatex"
 		docker:
-			image: "sharelatex-texlive"
+			image: process.env["TEX_LIVE_DOCKER_IMAGE"]
 			env:
 				PATH: process.env["COMPILER_PATH"] or "/usr/local/texlive/2015/bin/x86_64-linux:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 			user: "tex"