netbox: upgrade to 3.6.0

5 files changed, 8 insertions, 32 deletions

diff --git a/netbox/Dockerfile b/netbox/Dockerfile
index b3620a2..29f911f 100644
--- a/netbox/Dockerfile
+++ b/netbox/Dockerfile
@@ -4,7 +4,6 @@ LABEL maintainer="Mike Crute <mike@crute.us>"
 ARG netbox_version
 
 ADD configuration.py /configuration.py
-ADD django.patch /django.patch
 
 RUN set -euxo pipefail; \
     \
@@ -39,7 +38,6 @@ RUN set -euxo pipefail; \
     \
     cd /; \
     mv /configuration.py /opt/netbox/netbox/netbox/configuration.py; \
-    patch -p1 < /django.patch; rm /django.patch; \
     cd /opt/netbox; \
     \
     export NETBOX_SECRET_KEY="testing key for running the build that must be at least fifty characters"; \
diff --git a/netbox/Makefile b/netbox/Makefile
index 793beaa..d3bfdbb 100644
--- a/netbox/Makefile
+++ b/netbox/Makefile
@@ -1,5 +1,5 @@
-VERSION=3.5.7
-VERSION_TAG=$(VERSION)-0
+VERSION=3.6.0
+VERSION_TAG=$(VERSION)-1
 IMAGE=docker.crute.me/netbox:$(VERSION_TAG)
 LATEST=$(subst :$(VERSION_TAG),,$(IMAGE)):latest
 
diff --git a/netbox/configuration.py b/netbox/configuration.py
index 74d7a15..8768961 100644
--- a/netbox/configuration.py
+++ b/netbox/configuration.py
@@ -10,7 +10,7 @@ DATABASE = {
     'PASSWORD': os.getenv("NETBOX_DB_PASSWORD"),
     'CONN_MAX_AGE': 300,
     'OPTIONS': {
-        'role': os.getenv("NETBOX_SET_ROLE"),
+        'assume_role': os.getenv("NETBOX_SET_ROLE"),
     }
 }
 
diff --git a/netbox/django.patch b/netbox/django.patch
deleted file mode 100644
index 7318a49..0000000
--- a/netbox/django.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/usr/lib/python3.11/site-packages/django/db/backends/postgresql/base.py 21:41:07.000000000 -0800
-+++ b/usr/lib/python3.11/site-packages/django/db/backends/postgresql/base.py 19:52:18.092424193 -0800
-@@ -199,6 +199,7 @@
-         else:
-             conn_params = {**settings_dict["OPTIONS"]}
-
-+        conn_params.pop("role", None)
-         conn_params.pop("isolation_level", None)
-         if settings_dict["USER"]:
-             conn_params["user"] = settings_dict["USER"]
-@@ -256,6 +257,16 @@
-             if not self.get_autocommit():
-                 self.connection.commit()
-
-+        # Set the role on the connection. This is useful if the
-+        # credential used to login is not the same as the role that
-+        # owns database resources. This scenario can occur when using
-+        # temporary credentials generated by an external system like
-+        # Vault.
-+        options = self.settings_dict["OPTIONS"]
-+        if options["role"]:
-+            with self.connection.cursor() as cursor:
-+                cursor.execute("SET ROLE %s", (options["role"],))
-+
-     @async_unsafe
-     def create_cursor(self, name=None):
-         if name:
diff --git a/netbox/simplevisor.json b/netbox/simplevisor.json
index 666a765..e0740b9 100644
--- a/netbox/simplevisor.json
+++ b/netbox/simplevisor.json
@@ -51,6 +51,11 @@
                 "name": "clearcache",
                 "cmd": ["/usr/bin/python3", "/opt/netbox/netbox/manage.py", "clearcache"],
                 "run-as": "netbox"
+            },
+            {
+                "name": "lazy_reindex",
+                "cmd": ["/usr/bin/python3", "/opt/netbox/netbox/manage.py", "reindex", "--lazy"],
+                "run-as": "netbox"
             }
         ],
         "main": [