From 24fdfbbf5bd22e559742bd46ea422c737a790cd2 Mon Sep 17 00:00:00 2001
From: Krzysztof Szumny <krzysztof.szumny@spistresci.pl>
Date: Sat, 22 Aug 2015 18:30:31 +0200
Subject: [PATCH] unnecessary python packages removed from debug/Dockerfile

---
 {{cookiecutter.repo_name}}/Dockerfile         | 29 ++++++++++---------
 .../compose/debug/Dockerfile                  |  5 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/{{cookiecutter.repo_name}}/Dockerfile b/{{cookiecutter.repo_name}}/Dockerfile
index a2aa2596f..0049b5a26 100644
--- a/{{cookiecutter.repo_name}}/Dockerfile
+++ b/{{cookiecutter.repo_name}}/Dockerfile
@@ -1,7 +1,9 @@
 FROM python:2.7
 ENV PYTHONUNBUFFERED 1
 
-RUN apt-get update && apt-get install -y ruby-compass
+RUN apt-get update && \
+    apt-get install -y ruby-compass && \
+    rm -rf /var/lib/apt/lists/*
 
 # Requirements have to be pulled and installed here, otherwise caching won't work
 ADD ./requirements /requirements
@@ -11,19 +13,18 @@ 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 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 3fc7910ff..f902ee5e5 100644
--- a/{{cookiecutter.repo_name}}/compose/debug/Dockerfile
+++ b/{{cookiecutter.repo_name}}/compose/debug/Dockerfile
@@ -1,8 +1,7 @@
 FROM {{ cookiecutter.repo_name|replace('_', '') }}_django
 
-# Install setuptools, pip and OpenSSH
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python-pip python-setuptools python3-pip python3-setuptools openssh-server && \
-    rm -rf /var/lib/apt/lists/*
+# Install OpenSSH
+RUN apt-get -y install openssh-server
 
 # sshd needs this directory to run
 RUN mkdir -p /var/run/sshd