From 6ed33af0636e48d4bd9e834b6c9ab79233807aa4 Mon Sep 17 00:00:00 2001
From: Robert Drake <rdrake@direcpath.com>
Date: Sat, 6 Aug 2016 02:35:42 -0400
Subject: [PATCH] Changes to Dockerfile to make the build faster

To download a new version with docker, I've been running

	git pull
	docker-compose build --no-cache

This is slow, but no-cache is needed so that "git clone" pulls the
latest copy.

Most of the slowness comes from pulling down apt files each time a
rebuild needs to be done.  If we move that into a docker image then only
the local changes need to be rebuilt.

Further refinements could be done.  If the python dependencies that are
brought in from requirements.txt could be moved to an image then nothing
would change between updates as long as dependant versions hadn't
changed.  This would probably be more trouble than it's worth, unless
you're recreating netbox containers 10-20 times a day.
---
 Dockerfile       | 26 ++++++--------------------
 requirements.txt |  1 +
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c2e2c38ab..aac301f2b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,10 @@
-FROM ubuntu:14.04
+FROM python:2.7-wheezy
 
-RUN apt-get update && apt-get install -y \
-	python2.7 \
-	python-dev \
-	git \
-	python-pip \
-	libxml2-dev \
-	libxslt1-dev \
-	libffi-dev \
-	graphviz \
-	libpq-dev \
-	build-essential \
-	gunicorn \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& mkdir -p /opt/netbox \
-	&& cd /opt/netbox \
-	&& git clone --depth 1 https://github.com/digitalocean/netbox.git -b master . \
-	&& pip install -r requirements.txt \
-	&& apt-get purge -y --auto-remove git build-essential
+WORKDIR /opt/netbox
+
+ADD . /opt/netbox
+#RUN git clone --depth 1 https://github.com/digitalocean/netbox.git -b master . \
+RUN	pip install -r requirements.txt
 
 ADD docker/docker-entrypoint.sh /docker-entrypoint.sh
 ADD netbox/netbox/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py
diff --git a/requirements.txt b/requirements.txt
index 40b0b707f..f1836ea7f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+gunicorn==17.5
 cryptography==1.4
 Django==1.10
 django-debug-toolbar==1.4