From 3be9b1285553b8b77b728a3eb20f7e71075524dd Mon Sep 17 00:00:00 2001 From: Mike Crute Date: Tue, 8 Aug 2023 08:02:13 -0700 Subject: netbox: upgrade to 3.5.7 --- netbox/Dockerfile | 2 +- netbox/Makefile | 4 ++-- netbox/django.patch | 8 ++++---- 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; \ patch -p1 < /django.patch; rm /django.patch; \ cd /opt/netbox; \ \ - export NETBOX_SECRET_KEY="testing key for running the build"; \ + export NETBOX_SECRET_KEY="testing key for running the build that must be at least fifty characters"; \ export NETBOX_DB_PORT="0"; \ export NETBOX_REDIS_TASK_DB="0"; \ 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 @@ -VERSION=3.3.9 -VERSION_TAG=$(VERSION)-1 +VERSION=3.5.7 +VERSION_TAG=$(VERSION)-0 IMAGE=docker.crute.me/netbox:$(VERSION_TAG) LATEST=$(subst :$(VERSION_TAG),,$(IMAGE)):latest 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 @@ ---- a/usr/lib/python3.10/site-packages/django/db/backends/postgresql/base.py 21:41:07.000000000 -0800 -+++ b/usr/lib/python3.10/site-packages/django/db/backends/postgresql/base.py 19:52:18.092424193 -0800 -@@ -187,6 +187,7 @@ +--- 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"]} @@ -8,7 +8,7 @@ conn_params.pop("isolation_level", None) if settings_dict["USER"]: conn_params["user"] = settings_dict["USER"] -@@ -244,6 +245,16 @@ +@@ -256,6 +257,16 @@ if not self.get_autocommit(): self.connection.commit() -- cgit v1.2.3