aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Crute <mike@crute.us>2023-08-08 08:02:13 -0700
committerMike Crute <mike@crute.us>2023-08-08 08:02:13 -0700
commit3be9b1285553b8b77b728a3eb20f7e71075524dd (patch)
treef35b627efdc3fe5589ca89559dce6a0365b4da20
parent0f3a1456cbdde90e0ed3f611d6af3f1aed3b5b94 (diff)
downloaddockerfiles-3be9b1285553b8b77b728a3eb20f7e71075524dd.tar.bz2
dockerfiles-3be9b1285553b8b77b728a3eb20f7e71075524dd.tar.xz
dockerfiles-3be9b1285553b8b77b728a3eb20f7e71075524dd.zip
netbox: upgrade to 3.5.7
-rw-r--r--netbox/Dockerfile2
-rw-r--r--netbox/Makefile4
-rw-r--r--netbox/django.patch8
3 files changed, 7 insertions, 7 deletions
diff --git a/netbox/Dockerfile b/netbox/Dockerfile
index 0ca36fa..b3620a2 100644
--- a/netbox/Dockerfile
+++ b/netbox/Dockerfile
@@ -42,7 +42,7 @@ RUN set -euxo pipefail; \
42 patch -p1 < /django.patch; rm /django.patch; \ 42 patch -p1 < /django.patch; rm /django.patch; \
43 cd /opt/netbox; \ 43 cd /opt/netbox; \
44 \ 44 \
45 export NETBOX_SECRET_KEY="testing key for running the build"; \ 45 export NETBOX_SECRET_KEY="testing key for running the build that must be at least fifty characters"; \
46 export NETBOX_DB_PORT="0"; \ 46 export NETBOX_DB_PORT="0"; \
47 export NETBOX_REDIS_TASK_DB="0"; \ 47 export NETBOX_REDIS_TASK_DB="0"; \
48 export NETBOX_REDIS_CACHE_DB="0"; \ 48 export NETBOX_REDIS_CACHE_DB="0"; \
diff --git a/netbox/Makefile b/netbox/Makefile
index 2c15f43..793beaa 100644
--- a/netbox/Makefile
+++ b/netbox/Makefile
@@ -1,5 +1,5 @@
1VERSION=3.3.9 1VERSION=3.5.7
2VERSION_TAG=$(VERSION)-1 2VERSION_TAG=$(VERSION)-0
3IMAGE=docker.crute.me/netbox:$(VERSION_TAG) 3IMAGE=docker.crute.me/netbox:$(VERSION_TAG)
4LATEST=$(subst :$(VERSION_TAG),,$(IMAGE)):latest 4LATEST=$(subst :$(VERSION_TAG),,$(IMAGE)):latest
5 5
diff --git a/netbox/django.patch b/netbox/django.patch
index 2cb8d76..7318a49 100644
--- a/netbox/django.patch
+++ b/netbox/django.patch
@@ -1,6 +1,6 @@
1--- a/usr/lib/python3.10/site-packages/django/db/backends/postgresql/base.py 21:41:07.000000000 -0800 1--- a/usr/lib/python3.11/site-packages/django/db/backends/postgresql/base.py 21:41:07.000000000 -0800
2+++ b/usr/lib/python3.10/site-packages/django/db/backends/postgresql/base.py 19:52:18.092424193 -0800 2+++ b/usr/lib/python3.11/site-packages/django/db/backends/postgresql/base.py 19:52:18.092424193 -0800
3@@ -187,6 +187,7 @@ 3@@ -199,6 +199,7 @@
4 else: 4 else:
5 conn_params = {**settings_dict["OPTIONS"]} 5 conn_params = {**settings_dict["OPTIONS"]}
6 6
@@ -8,7 +8,7 @@
8 conn_params.pop("isolation_level", None) 8 conn_params.pop("isolation_level", None)
9 if settings_dict["USER"]: 9 if settings_dict["USER"]:
10 conn_params["user"] = settings_dict["USER"] 10 conn_params["user"] = settings_dict["USER"]
11@@ -244,6 +245,16 @@ 11@@ -256,6 +257,16 @@
12 if not self.get_autocommit(): 12 if not self.get_autocommit():
13 self.connection.commit() 13 self.connection.commit()
14 14