From ec24fc28fce1152c315d8c5b4f03410728395399 Mon Sep 17 00:00:00 2001
From: ShareLaTeX <team@sharelatex.com>
Date: Fri, 5 Aug 2016 14:22:42 +0000
Subject: [PATCH 1/2] added dollar to base path

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f31c08aabe..63a584ad6d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,7 +45,7 @@ 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/
+COPY ${baseDir}/init_scripts/  /etc/my_init.d/
 
 
 # Install ShareLaTeX

From 6cfe468a3b4c070258663aa8c82923b3e6609bc6 Mon Sep 17 00:00:00 2001
From: ShareLaTeX <team@sharelatex.com>
Date: Wed, 21 Sep 2016 12:47:07 +0000
Subject: [PATCH 2/2] move settings file to early on

---
 Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 63a584ad6d..cd53f43be7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,10 @@ RUN wget https://s3.amazonaws.com/sharelatex-random-files/qpdf-6.0.0.tar.gz && t
 WORKDIR /opt/qpdf-6.0.0
 RUN ./configure && make && make install && ldconfig
 
+# 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; \
@@ -69,9 +73,6 @@ RUN cd /var/www/sharelatex/web; \
 RUN cd /var/www/sharelatex/clsi; \
 	grunt compile:bin
 
-# Install ShareLaTeX settings file
-ADD ${baseDir}/settings.coffee /etc/sharelatex/settings.coffee
-ENV SHARELATEX_CONFIG /etc/sharelatex/settings.coffee
 
 
 EXPOSE 80