From e141d9f16de99f2771c360fbb1bb80bbaf13fae4 Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@qbeyond.de>
Date: Thu, 28 Mar 2024 10:39:51 +0100
Subject: [PATCH 1/2] Prepare for Netbox 4.0

---
 Dockerfile                     | 2 --
 configuration/configuration.py | 8 --------
 docker/docker-entrypoint.sh    | 5 ++---
 requirements-container.txt     | 1 -
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0c694a7..a2ceb95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,8 +31,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
 ARG NETBOX_PATH
 COPY ${NETBOX_PATH}/requirements.txt requirements-container.txt /
 RUN \
-    # We compile 'psycopg' in the build process
-    sed -i -e '/psycopg/d' /requirements.txt && \
     # Gunicorn is not needed because we use Nginx Unit
     sed -i -e '/gunicorn/d' /requirements.txt && \
     # We need 'social-auth-core[all]' in the Docker image. But if we put it in our own requirements-container.txt
diff --git a/configuration/configuration.py b/configuration/configuration.py
index 8568071..d74a7a9 100644
--- a/configuration/configuration.py
+++ b/configuration/configuration.py
@@ -320,11 +320,3 @@ SESSION_FILE_PATH = environ.get('SESSION_FILE_PATH', environ.get('SESSIONS_ROOT'
 # Time zone (default: UTC)
 TIME_ZONE = environ.get('TIME_ZONE', 'UTC')
 
-# Date/time formatting. See the following link for supported formats:
-# https://docs.djangoproject.com/en/stable/ref/templates/builtins/#date
-DATE_FORMAT = environ.get('DATE_FORMAT', 'N j, Y')
-SHORT_DATE_FORMAT = environ.get('SHORT_DATE_FORMAT', 'Y-m-d')
-TIME_FORMAT = environ.get('TIME_FORMAT', 'g:i a')
-SHORT_TIME_FORMAT = environ.get('SHORT_TIME_FORMAT', 'H:i:s')
-DATETIME_FORMAT = environ.get('DATETIME_FORMAT', 'N j, Y g:i a')
-SHORT_DATETIME_FORMAT = environ.get('SHORT_DATETIME_FORMAT', 'Y-m-d H:i')
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 14406d3..fa5930d 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -72,10 +72,9 @@ else
   fi
 
   ./manage.py shell --interface python <<END
-from django.contrib.auth.models import User
-from users.models import Token
+from users.models import Token, User
 if not User.objects.filter(username='${SUPERUSER_NAME}'):
-    u=User.objects.create_superuser('${SUPERUSER_NAME}', '${SUPERUSER_EMAIL}', '${SUPERUSER_PASSWORD}')
+    u = User.objects.create_superuser('${SUPERUSER_NAME}', '${SUPERUSER_EMAIL}', '${SUPERUSER_PASSWORD}')
     Token.objects.create(user=u, key='${SUPERUSER_API_TOKEN}')
 END
 
diff --git a/requirements-container.txt b/requirements-container.txt
index 3932065..35223e1 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,6 +1,5 @@
 django-auth-ldap==4.8.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.2
 dulwich==0.21.7
-psycopg[c,pool]==3.1.18
 python3-saml==1.16.0 --no-binary lxml
 sentry-sdk==1.45.0

From 1e78c386a5a3259173aa90b5243a9d5150d4e682 Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@qbeyond.de>
Date: Mon, 6 May 2024 09:56:49 +0200
Subject: [PATCH 2/2] Fixed regex for social-auth-core replacement

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a2ceb95..2a6de8c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,7 @@ RUN \
     # We need 'social-auth-core[all]' in the Docker image. But if we put it in our own requirements-container.txt
     # we have potential version conflicts and the build will fail.
     # That's why we just replace it in the original requirements.txt.
-    sed -i -e 's/social-auth-core\[openidconnect\]/social-auth-core\[all\]/g' /requirements.txt && \
+    sed -i -e 's/social-auth-core/social-auth-core\[all\]/g' /requirements.txt && \
     /opt/netbox/venv/bin/pip install \
       -r /requirements.txt \
       -r /requirements-container.txt