Merge pull request #3 from ninech/docker_improvements

Docker improvements

Dockerfile

@@ -1,20 +1,35 @@
-FROM python:2.7-wheezy
+FROM python:2.7-alpine
 
-WORKDIR /opt/netbox
+RUN apk add --no-cache \
+      bash \
+      build-base \
+      ca-certificates \
+      cyrus-sasl-dev \
+      graphviz \
+      jpeg-dev \
+      libffi-dev \
+      libxml2-dev \
+      libxslt-dev \
+      openldap-dev \
+      openssl-dev \
+      postgresql-dev \
+      wget \
+  && pip install gunicorn==17.5 django-auth-ldap
+
+WORKDIR /opt
 
 ARG BRANCH=v2-beta
-ARG URL=https://github.com/digitalocean/netbox.git
-RUN git clone --depth 1 $URL -b $BRANCH .  && \
-    apt-get update -qq && apt-get install -y libldap2-dev libsasl2-dev libssl-dev graphviz && \
-	pip install gunicorn==17.5 && \
-	pip install django-auth-ldap && \
-    pip install -r requirements.txt
+ARG URL=https://github.com/digitalocean/netbox/archive/$BRANCH.tar.gz
+RUN wget -q -O - "${URL}" | tar xz \
+  && ln -s netbox* netbox
 
-ADD docker/docker-entrypoint.sh /docker-entrypoint.sh
-ADD netbox/netbox/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py
+WORKDIR /opt/netbox
+RUN pip install -r requirements.txt
 
+RUN ln -s configuration.docker.py netbox/netbox/configuration.py
+COPY docker/gunicorn_config.py /opt/netbox/
+
+COPY docker/docker-entrypoint.sh /docker-entrypoint.sh
 ENTRYPOINT [ "/docker-entrypoint.sh" ]
 
-ADD docker/gunicorn_config.py /opt/netbox/
-ADD docker/nginx.conf /etc/netbox-nginx/
 VOLUME ["/etc/netbox-nginx/"]

docker-compose.yml

@@ -1,53 +1,32 @@
-version: '2'
-
+version: '3'
 services:
-    postgres:
-        image: postgres:9.6
-        container_name: postgres
-        environment:
-            POSTGRES_USER: netbox
-            POSTGRES_PASSWORD: J5brHrAXFLQSif0K
-            POSTGRES_DB: netbox
     netbox:
         build: .
-        image: digitalocean/netbox
-        links:
-        - postgres
-        container_name: netbox
+        image: digitalocean/netbox:v2.0-beta2
         depends_on:
         - postgres
-        environment:
-            SUPERUSER_NAME: admin
-            SUPERUSER_EMAIL: admin@example.com
-            SUPERUSER_PASSWORD: admin
-            ALLOWED_HOSTS: localhost
-            DB_NAME: netbox
-            DB_USER: netbox
-            DB_PASSWORD: J5brHrAXFLQSif0K
-            DB_HOST: postgres
-            SECRET_KEY: r8OwDznj!!dci#P9ghmRfdu1Ysxm0AiPeDCQhKE+N_rClfWNj
-            EMAIL_SERVER: localhost
-            EMAIL_PORT: 25
-            EMAIL_USERNAME: foo
-            EMAIL_PASSWORD: bar
-            EMAIL_TIMEOUT: 10
-            EMAIL_FROM: netbox@bar.com
-            NETBOX_USERNAME: guest
-            NETBOX_PASSWORD: guest
+        env_file: netbox.env
         volumes:
+        - netbox-nginx-config:/etc/netbox-nginx/
         - netbox-static-files:/opt/netbox/netbox/static
     nginx:
-        image: nginx:1.11.1-alpine
-        links:
-        - netbox
-        container_name: nginx
+        image: nginx:1.11-alpine
         command: nginx -g 'daemon off;' -c /etc/netbox-nginx/nginx.conf
         depends_on:
         - netbox
         ports:
-        - 80:80
-        volumes_from:
-        - netbox
+        - 80
+        volumes:
+        - netbox-static-files:/opt/netbox/netbox/static
+        - netbox-nginx-config:/etc/netbox-nginx/
+    postgres:
+        image: postgres:9.6-alpine
+        environment:
+            POSTGRES_USER: netbox
+            POSTGRES_PASSWORD: J5brHrAXFLQSif0K
+            POSTGRES_DB: netbox
 volumes:
     netbox-static-files:
         driver: local
+    netbox-nginx-config:
+        driver: local

docker/docker-entrypoint.sh

@@ -13,7 +13,12 @@ if [[ -z ${SUPERUSER_NAME} || -z ${SUPERUSER_EMAIL} || -z ${SUPERUSER_PASSWORD}
         SUPERUSER_PASSWORD='admin'
         echo "Using defaults: Username: ${SUPERUSER_NAME}, E-Mail: ${SUPERUSER_EMAIL}, Password: ${SUPERUSER_PASSWORD}"
 fi
-echo "from django.contrib.auth.models import User; User.objects.create_superuser('${SUPERUSER_NAME}', '${SUPERUSER_EMAIL}', '${SUPERUSER_PASSWORD}')" | python /opt/netbox/netbox/manage.py shell
+
+python netbox/manage.py shell --plain << END
+from django.contrib.auth.models import User
+if not User.objects.filter(username='${SUPERUSER_NAME}'):
+    User.objects.create_superuser('${SUPERUSER_NAME}', '${SUPERUSER_EMAIL}', '${SUPERUSER_PASSWORD}')
+END
 
 # copy static files
 /opt/netbox/netbox/manage.py collectstatic --no-input

netbox.env

@@ -0,0 +1,17 @@
+SUPERUSER_NAME=admin
+SUPERUSER_EMAIL=admin@example.com
+SUPERUSER_PASSWORD=admin
+ALLOWED_HOSTS=localhost
+DB_NAME=netbox
+DB_USER=netbox
+DB_PASSWORD=J5brHrAXFLQSif0K
+DB_HOST=postgres
+SECRET_KEY=r8OwDznj!!dci#P9ghmRfdu1Ysxm0AiPeDCQhKE+N_rClfWNj
+EMAIL_SERVER=localhost
+EMAIL_PORT=25
+EMAIL_USERNAME=foo
+EMAIL_PASSWORD=bar
+EMAIL_TIMEOUT=10
+EMAIL_FROM=netbox@bar.com
+NETBOX_USERNAME=guest
+NETBOX_PASSWORD=guest