From 3bf346c0c171d7d763373f313181d18a1d68c17b Mon Sep 17 00:00:00 2001
From: Krzysztof Szumny <krzysztof.szumny@spistresci.pl>
Date: Sat, 22 Aug 2015 21:25:17 +0200
Subject: [PATCH] cookiecutterdjango/base extracted from main Dockerfile, to
 speed-up building process

---
 {{cookiecutter.repo_name}}/Dockerfile         | 23 +------------------
 .../compose/base/Dockerfile                   | 22 ++++++++++++++++++
 .../compose/debug/Dockerfile                  |  4 +++-
 3 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100644 {{cookiecutter.repo_name}}/compose/base/Dockerfile

diff --git a/{{cookiecutter.repo_name}}/Dockerfile b/{{cookiecutter.repo_name}}/Dockerfile
index 0049b5a26..8bf6b0760 100644
--- a/{{cookiecutter.repo_name}}/Dockerfile
+++ b/{{cookiecutter.repo_name}}/Dockerfile
@@ -1,9 +1,4 @@
-FROM python:2.7
-ENV PYTHONUNBUFFERED 1
-
-RUN apt-get update && \
-    apt-get install -y ruby-compass && \
-    rm -rf /var/lib/apt/lists/*
+FROM cookiecutterdjango/base
 
 # Requirements have to be pulled and installed here, otherwise caching won't work
 ADD ./requirements /requirements
@@ -12,22 +7,6 @@ ADD ./requirements.txt /requirements.txt
 RUN pip install -r /requirements.txt
 RUN pip install -r /requirements/local.txt
 
-# Install Node.js
-RUN cd /tmp && \
-    wget http://nodejs.org/dist/node-latest.tar.gz && \
-    tar xvzf node-latest.tar.gz && \
-    rm -f node-latest.tar.gz && \
-    cd node-v* && \
-    ./configure && \
-    CXX="g++ -Wno-unused-local-typedefs" make && \
-    CXX="g++ -Wno-unused-local-typedefs" make install && \
-    cd /tmp && \
-    rm -rf /tmp/node-v* && \
-    npm install -g npm && \
-    printf '\n# Node.js\nexport PATH="node_modules/.bin:$PATH"' >> /root/.bashrc
-
-RUN npm install -g grunt-cli
-
 ADD . /app
 
 WORKDIR /app
diff --git a/{{cookiecutter.repo_name}}/compose/base/Dockerfile b/{{cookiecutter.repo_name}}/compose/base/Dockerfile
new file mode 100644
index 000000000..7c68bfc93
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/compose/base/Dockerfile
@@ -0,0 +1,22 @@
+FROM python:2.7
+ENV PYTHONUNBUFFERED 1
+
+RUN apt-get update && \
+    apt-get install -y ruby-compass && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install Node.js
+RUN cd /tmp && \
+    wget http://nodejs.org/dist/node-latest.tar.gz && \
+    tar xvzf node-latest.tar.gz && \
+    rm -f node-latest.tar.gz && \
+    cd node-v* && \
+    ./configure && \
+    CXX="g++ -Wno-unused-local-typedefs" make && \
+    CXX="g++ -Wno-unused-local-typedefs" make install && \
+    cd /tmp && \
+    rm -rf /tmp/node-v* && \
+    npm install -g npm && \
+    printf '\n# Node.js\nexport PATH="node_modules/.bin:$PATH"' >> /root/.bashrc
+
+RUN npm install -g grunt-cli
diff --git a/{{cookiecutter.repo_name}}/compose/debug/Dockerfile b/{{cookiecutter.repo_name}}/compose/debug/Dockerfile
index f902ee5e5..37784d0b4 100644
--- a/{{cookiecutter.repo_name}}/compose/debug/Dockerfile
+++ b/{{cookiecutter.repo_name}}/compose/debug/Dockerfile
@@ -1,7 +1,9 @@
 FROM {{ cookiecutter.repo_name|replace('_', '') }}_django
 
 # Install OpenSSH
-RUN apt-get -y install openssh-server
+RUN apt-get update && \
+    apt-get -y install openssh-server && \
+    rm -rf /var/lib/apt/lists/*
 
 # sshd needs this directory to run
 RUN mkdir -p /var/run/sshd