From 44d0f47fb5d6d612e074199f8e7e77eaa745f1ba Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Fri, 7 Jul 2023 08:12:33 +0200
Subject: [PATCH 1/2] Prepare for Netbox 3.6

---
 Dockerfile                                        | 4 ++--
 VERSION                                           | 2 +-
 docker-compose.test.yml                           | 2 +-
 docker-compose.yml                                | 2 +-
 requirements-container.txt                        | 3 ++-
 test-configuration/{logging.py => test_config.py} | 2 ++
 6 files changed, 9 insertions(+), 6 deletions(-)
 rename test-configuration/{logging.py => test_config.py} (72%)

diff --git a/Dockerfile b/Dockerfile
index bd00e9032..a090c08af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,8 +31,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \
 ARG NETBOX_PATH
 COPY ${NETBOX_PATH}/requirements.txt requirements-container.txt /
 RUN \
-    # We compile 'psycopg2' in the build process
-    sed -i -e '/psycopg2-binary/d' /requirements.txt && \
+    # 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/VERSION b/VERSION
index 6a6a3d8e3..24ba9a38d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6.1
+2.7.0
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 680c16c5f..0035f3268 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -12,7 +12,7 @@ services:
     env_file: env/netbox.env
     user: 'unit:root'
     volumes:
-    - ./test-configuration/logging.py:/etc/netbox/config/logging.py:z,ro
+    - ./test-configuration/test_config.py:/etc/netbox/config/test_config.py:z,ro
     healthcheck:
       start_period: ${NETBOX_START_PERIOD-120s}
       timeout: 3s
diff --git a/docker-compose.yml b/docker-compose.yml
index a0076b745..38cd6582e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   netbox: &netbox
-    image: docker.io/netboxcommunity/netbox:${VERSION-v3.5-2.6.1}
+    image: docker.io/netboxcommunity/netbox:${VERSION-v3.6-2.7.0}
     depends_on:
     - postgres
     - redis
diff --git a/requirements-container.txt b/requirements-container.txt
index 20faff097..8ea63525a 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,4 +1,5 @@
 django-auth-ldap==4.5.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.13.2
-psycopg2==2.9.6
+dulwich==0.21.5
+psycopg[c,pool]==3.1.10
 python3-saml==1.15.0
diff --git a/test-configuration/logging.py b/test-configuration/test_config.py
similarity index 72%
rename from test-configuration/logging.py
rename to test-configuration/test_config.py
index ab15e2a87..884defd42 100644
--- a/test-configuration/logging.py
+++ b/test-configuration/test_config.py
@@ -2,3 +2,5 @@
     'version': 1,
     'disable_existing_loggers': True
 }
+
+DEFAULT_PERMISSIONS = {}

From 69c5580a3ed5a763609e14b1be50c7135ad65b46 Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Tue, 29 Aug 2023 13:13:57 +0200
Subject: [PATCH 2/2] Fix #1061: Install openssh-client

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

diff --git a/Dockerfile b/Dockerfile
index a090c08af..558f76462 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,6 +62,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
       libldap-common \
       libpq5 \
       libxmlsec1-openssl \
+      openssh-client \
       openssl \
       python3 \
       python3-distutils \