From e3cce07966bb00967bbde18e1c1dfc011e729ca3 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Mon, 9 Dec 2013 17:28:24 +0530
Subject: [PATCH] dockerfile: run ruby compilation after installing packages
 using apt-get.

basically to improve cache hits while updating the ruby package.
---
 Dockerfile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 56102bbd..5243ba1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,19 +8,18 @@ RUN apt-get install -y wget curl unzip build-essential checkinstall zlib1g-dev l
 		libgdbm-dev libreadline-dev libncurses5-dev libffi-dev && \
 		apt-get clean
 
-RUN wget ftp://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p247.tar.gz -O - | tar -zxf - -C /tmp/ && \
-		cd /tmp/ruby-2.0.0-p247/ && \
-		./configure --disable-install-rdoc --enable-pthread --prefix=/usr && \
-		make && make install && \
-		cd /tmp && rm -rf /tmp/ruby-2.0.0-p247 && \
-		gem install --no-ri --no-rdoc bundler
-
 RUN apt-get install -y python-software-properties && \
 		add-apt-repository -y ppa:git-core/ppa && \
 		apt-get update && apt-get install -y libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev libmysqlclient-dev \
 		sudo nginx git-core mysql-server openssh-server redis-server python-docutils postfix logrotate supervisor vim && \
 		apt-get clean
 
+RUN wget ftp://ftp.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p247.tar.gz -O - | tar -zxf - -C /tmp/ && \
+		cd /tmp/ruby-2.0.0-p247/ && \
+		./configure --disable-install-rdoc --enable-pthread --prefix=/usr && \
+		make && make install && \
+		cd /tmp && rm -rf /tmp/ruby-2.0.0-p247 && \
+		gem install --no-ri --no-rdoc bundler
 
 ADD resources/ /gitlab/
 RUN chmod 755 /gitlab/gitlab /gitlab/setup/install && /gitlab/setup/install