Merge upstream v2.7.8 into develop

docker-compose.yml

@@ -1,40 +1,70 @@
-version: '3'
+version: '3.4'
 services:
+  netbox: &netbox
+    image: vaporio/netbox:develop
+    build:
+      context: .
+      args:
+        BUILD_VERSION: 'local-dev'
+        BUILD_DATE: ''
+        VCS_REF: 'tip'
+    depends_on:
+    - postgres
+    - redis
+    - redis-cache
+    - netbox-worker
+    env_file: docker/env/netbox.env
+    #user: '1000:1000'
+    volumes:
+    - ./netbox:/opt/netbox/netbox
+    - ./docker/startup_scripts:/opt/netbox/startup_scripts:z,ro
+    - ./docker/initializers:/opt/netbox/initializers:z,ro
+    - ./docker/configuration:/etc/netbox/config:z,ro
+    - ./reports:/etc/netbox/reports:z,ro
+    - ./scripts:/etc/netbox/scripts:z,ro
+    - netbox-nginx-config:/etc/netbox-nginx:z
+    - netbox-static-files:/opt/netbox/netbox/static:z
+    - netbox-media-files:/opt/netbox/netbox/media:z
+  netbox-worker:
+    <<: *netbox
+    depends_on:
+    - redis
+    entrypoint:
+    - python3
+    - /opt/netbox/netbox/manage.py
+    command:
+    - rqworker
+  nginx:
+    command: nginx -g 'daemon off;' -c /etc/netbox-nginx/nginx.conf
+    image: nginx
+    depends_on:
+    - netbox
+    ports:
+    - 8080
+    volumes:
+    - netbox-static-files:/opt/netbox/netbox/static:ro
+    - netbox-nginx-config:/etc/netbox-nginx/:ro
   postgres:
-    image: "postgres:9.6"
+    image: postgres:11-alpine
     environment:
       POSTGRES_PASSWORD: "12345"
       POSTGRES_DB: netbox
-    ports:
-    - 5432:5432
+    volumes:
+    - netbox-postgres-data:/var/lib/postgresql/data
   redis:
-    image: "redis"
-  nginx:
-    image: "nginx"
+    image: redis:5-alpine
     volumes:
-    - "static:/opt/netbox/netbox/static"
-    - "./docker/nginx.conf:/etc/nginx/nginx.conf"
-    ports:
-    - 8000:80
-    depends_on:
-    - netbox
-  netbox:
-    image: "vaporio/netbox:develop"
-    environment:
-      SECRET_KEY: secret
-      DB_HOST: postgres
-      DB_USER: postgres
-      DB_PASSWORD: "12345"
-      ALLOWED_HOSTS: "*"
-      REDIS_HOST: redis
-    depends_on:
-    - redis
-    - postgres
-    volumes:
-    - "./netbox:/opt/netbox/netbox"
-    - "static:/opt/netbox/netbox/static"
-    - "./docker/configuration.docker.py:/opt/netbox/netbox/netbox/configuration.py"
-    - "./docker/startup_scripts/:/opt/netbox/startup_scripts"
-    - "./docker/initializers/:/opt/netbox/initializers"
+    - netbox-redis-data:/data
+  redis-cache:
+    image: redis:5-alpine
 volumes:
-  static:
+  netbox-static-files:
+    driver: local
+  netbox-nginx-config:
+    driver: local
+  netbox-media-files:
+    driver: local
+  netbox-postgres-data:
+    driver: local
+  netbox-redis-data:
+    driver: local