Merge branch 'develop' of github.com:digitalocean/netbox into develop

.travis.yml

@@ -1,3 +1,11 @@
+sudo: required
+
+services:
+  - docker
+
+env:
+  - DOCKER_TAG=$TRAVIS_TAG
+
 language: python
 python:
   - "2.7"
@@ -6,3 +14,7 @@ install:
   - pip install pep8
 script:
   - ./scripts/cibuild.sh
+after_success:
+  - if [ ! -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+    ./scripts/docker-build.sh;
+    fi

scripts/docker-build.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+if [ $? -ne 0 ]; then
+  echo "docker login failed."
+  exit 1
+fi
+
+docker build -t "$DOCKER_REPOSITORY/$DOCKER_IMAGE_NAME:$DOCKER_TAG" .
+if [ $? -ne 0 ]; then
+  echo "docker build failed."
+  exit 1
+fi
+
+docker push "$DOCKER_REPOSITORY/$DOCKER_IMAGE_NAME:$DOCKER_TAG"
+if [ $? -ne 0 ]; then
+  echo "docker push failed."
+  exit 1
+fi
+
+exit 0