From 8cdbf08482d785fda6091bb35c54353203aa8978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=A9munaire?= <nemunaire@pomail.fr>
Date: Sun, 18 Jan 2015 12:09:29 +0100
Subject: [PATCH] Optimize backend Dockerfile to reduce building time

---
 Dockerfile | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1453b109..505b4c27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,31 +28,13 @@ RUN apt-get -y update && \
 
 RUN useradd -d /var/www/fic-server -M -N -g www-data synchro
 
-# Copying files #######################################################
-
-WORKDIR /var/www/fic-server
-
-COPY . /var/www/fic-server/
-
-# Configure softwares #################################################
-
-RUN dpkg -i /var/www/fic-server/libmcrypt-perl*.deb || \
-    (echo "Please build perl-mcrypt first. Consult the given README!"; exit 1) && \
-    rm /var/www/fic-server/libmcrypt-perl*.deb && \
-    ln -sf /var/www/fic-server/nginx-server.conf /etc/nginx/sites-enabled/default && \
-    ln -sf /var/www/fic-server/php-fpm.conf /etc/php5/fpm/pool.d/www.conf
-
-# Configure site ######################################################
-
-RUN ln -sf /var/www/fic-server/onyx/config/sample.root.xml /var/www/fic-server/onyx/config/root.xml && \
-    sed -i "s/challenge-public//" /var/www/fic-server/onyx/config/root.xml && \
-    chmod 777 /var/www/fic-server/onyx/cache/ /var/www/fic-server/onyx/cache/templates/cache/ /var/www/fic-server/onyx/cache/templates/compile/
-
 # ENVIRONNEMENT #######################################################
 
 EXPOSE 80/tcp 443/tcp
 VOLUME ["/var/www/fic-server/out","/var/www/fic-server/files","/var/www/fic-server/submission","/var/www/fic-server/shared"]
 
+WORKDIR /var/www/fic-server
+
 ENTRYPOINT ["/var/www/fic-server/entrypoint.sh"]
 
 CMD    service nginx start && \
@@ -61,3 +43,19 @@ CMD    service nginx start && \
        chown www-data ./shared/nginx-teams.conf && \
        (./launch.sh &); \
        /bin/bash
+
+# Copying files #######################################################
+
+COPY . /var/www/fic-server/
+
+# Configure softwares #################################################
+
+RUN dpkg -i /var/www/fic-server/libmcrypt-perl*.deb || \
+    (echo "Please build perl-mcrypt first. Consult the given README!"; exit 1) && \
+    rm /var/www/fic-server/libmcrypt-perl*.deb && \
+    ln -sf /var/www/fic-server/nginx-server.conf /etc/nginx/sites-enabled/default && \
+    ln -sf /var/www/fic-server/php-fpm.conf /etc/php5/fpm/pool.d/www.conf && \
+    \
+    ln -sf /var/www/fic-server/onyx/config/sample.root.xml /var/www/fic-server/onyx/config/root.xml && \
+    sed -i "s/challenge-public//" /var/www/fic-server/onyx/config/root.xml && \
+    chmod 777 /var/www/fic-server/onyx/cache/ /var/www/fic-server/onyx/cache/templates/cache/ /var/www/fic-server/onyx/cache/templates/compile/