Merge branch 'master' into Enable-uploading-of-images

Dockerfile

@@ -6,6 +6,7 @@ RUN apk add --no-cache \
       ca-certificates \
       cyrus-sasl-dev \
       graphviz \
+      ttf-ubuntu-font-family \
       jpeg-dev \
       libffi-dev \
       libxml2-dev \

README.md

@@ -12,6 +12,7 @@ To get NetBox up and running:
 ```
 $ git clone -b master https://github.com/ninech/netbox-docker.git
 $ cd netbox-docker
+$ docker-compose pull
 $ docker-compose up -d
 ```
 
@@ -29,10 +30,14 @@ $ open "http://$(docker-compose port nginx 80)/"
 $ xdg-open "http://$(docker-compose port nginx 80)/" &>/dev/null &
 ```
 
+Alternatively, use something like [Reception](https://github.com/ninech/reception) to
+connect to _docker-compose_ projects.
+
 Default credentials:
 
 * Username: **admin**
 * Password: **admin**
+* API Token: **0123456789abcdef0123456789abcdef01234567**
 
 ## Dependencies
 
@@ -55,7 +60,7 @@ To use this feature, set the environment-variable `VERSION` before launching `do
 [any tag of the `ninech/netbox` Docker image](https://hub.docker.com/r/ninech/netbox/tags/).
 
 ```
-$ export VERSION=v2.2.1
+$ export VERSION=v2.2.6
 $ docker-compose pull netbox
 $ docker-compose up -d
 ```

docker/docker-entrypoint.sh

@@ -1,30 +1,40 @@
 #!/bin/bash
 set -e
 
-# run db migrations (retry on error)
+# wait shortly and then run db migrations (retry on error)
 while ! ./manage.py migrate 2>&1; do
-    sleep 5
+  echo "⏳ Waiting on DB..."
+  sleep 3
 done
 
 # create superuser silently
-if [[ -z ${SUPERUSER_NAME} || -z ${SUPERUSER_EMAIL} || -z ${SUPERUSER_PASSWORD} ]]; then
+if [[ -z ${SUPERUSER_NAME} ]]; then
   SUPERUSER_NAME='admin'
-        SUPERUSER_EMAIL='admin@example.com'
-        SUPERUSER_PASSWORD='admin'
-        echo "Using defaults: Username: ${SUPERUSER_NAME}, E-Mail: ${SUPERUSER_EMAIL}, Password: ${SUPERUSER_PASSWORD}"
 fi
+if [[ -z ${SUPERUSER_EMAIL} ]]; then
+  SUPERUSER_EMAIL='admin@example.com'
+fi
+if [[ -z ${SUPERUSER_PASSWORD} ]]; then
+  SUPERUSER_PASSWORD='admin'
+fi
+if [[ -z ${SUPERUSER_API_TOKEN} ]]; then
+  SUPERUSER_API_TOKEN='0123456789abcdef0123456789abcdef01234567'
+fi
+
+echo "💡 Username: ${SUPERUSER_NAME}, E-Mail: ${SUPERUSER_EMAIL}, Password: ${SUPERUSER_PASSWORD}, Token: ${SUPERUSER_API_TOKEN}"
 
 ./manage.py shell --plain << END
 from django.contrib.auth.models import User
+from users.models import Token
 if not User.objects.filter(username='${SUPERUSER_NAME}'):
-    User.objects.create_superuser('${SUPERUSER_NAME}', '${SUPERUSER_EMAIL}', '${SUPERUSER_PASSWORD}')
+    u=User.objects.create_superuser('${SUPERUSER_NAME}', '${SUPERUSER_EMAIL}', '${SUPERUSER_PASSWORD}')
+    Token.objects.create(user=u, key='${SUPERUSER_API_TOKEN}')
 END
 
 # copy static files
 ./manage.py collectstatic --no-input
 
-echo "✅ Initialisation is done. Launching CMD:"
-echo "exec ${@}"
+echo "✅ Initialisation is done."
 
 # launch whatever is passed by docker via RUN
 exec ${@}

netbox.env

@@ -1,7 +1,8 @@
 SUPERUSER_NAME=admin
 SUPERUSER_EMAIL=admin@example.com
 SUPERUSER_PASSWORD=admin
-ALLOWED_HOSTS=localhost
+SUPERUSER_API_TOKEN=0123456789abcdef0123456789abcdef01234567
+ALLOWED_HOSTS=localhost 0.0.0.0 127.0.0.1 [::1] netbox nginx netboxdocker.docker nginx.netboxdocker.docker
 DB_NAME=netbox
 DB_USER=netbox
 DB_PASSWORD=J5brHrAXFLQSif0K