Merge pull request #1219 from netbox-community/develop

Version 2.9.0

VERSION

@@ -1 +1 @@
-2.9.1
+2.9.0

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   netbox: &netbox
-    image: docker.io/netboxcommunity/netbox:${VERSION-v4.0-2.9.1}
+    image: docker.io/netboxcommunity/netbox:${VERSION-v4.0-2.9.0}
     depends_on:
     - postgres
     - redis
@@ -11,10 +11,9 @@ services:
       start_period: 60s
       timeout: 3s
       interval: 15s
-      test: "curl -f http://localhost:8080/login/ || exit 1"
+      test: "curl -f http://localhost:8080/api/ || exit 1"
     volumes:
     - ./configuration:/etc/netbox/config:z,ro
-    - init-files:/opt/init:ro
     - netbox-media-files:/opt/netbox/netbox/media:rw
     - netbox-reports-files:/opt/netbox/netbox/reports:rw
     - netbox-scripts-files:/opt/netbox/netbox/scripts:rw
@@ -73,8 +72,6 @@ services:
     - netbox-redis-cache-data:/data
 
 volumes:
-  init-files:
-    driver: local
   netbox-media-files:
     driver: local
   netbox-postgres-data:

docker/docker-entrypoint.sh

@@ -1,19 +1,12 @@
 #!/bin/bash
 # Runs on every start of the NetBox Docker container
 
-# Stop when an error occurs
+# Stop when an error occures
 set -e
 
 # Allows NetBox to be run as non-root users
 umask 002
 
-if [ -d /opt/init/pre ]; then
-  find /opt/init/pre -type f -name \*.sh | sort -u | while read -r FILE; do
-    echo "⚙️ Running pre-init script '${FILE}'..."
-    /bin/bash -e "${FILE}" "$@"
-  done
-fi
-
 # Load correct Python3 env
 # shellcheck disable=SC1091
 source /opt/netbox/venv/bin/activate
@@ -98,15 +91,8 @@ except Token.DoesNotExist:
     pass
 END
 
-if [ -d /opt/init/post ]; then
-  find /opt/init/post -type f -name \*.sh | sort -u | while read -r FILE; do
-    echo "⚙️ Running post-init script '${FILE}'..."
-    /bin/bash -e "${FILE}" "$@"
-  done
-fi
-
 echo "✅ Initialisation is done."
 
 # Launch whatever is passed by docker
-# (i.e. the CMD instruction in the Dockerfile)
+# (i.e. the RUN instruction in the Dockerfile)
 exec "$@"

requirements-container.txt

@@ -2,4 +2,4 @@ django-auth-ldap==4.8.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.3
 dulwich==0.22.1
 python3-saml==1.16.0 --no-binary lxml
-sentry-sdk[django]==2.1.1
+sentry-sdk==2.1.1