Merge pull request #1039 from tobiasge/netbox-3.6

Prepare for Netbox 3.6

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
@@ -62,6 +62,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
       libldap-common \
       libpq5 \
       libxmlsec1-openssl \
+      openssh-client \
       openssl \
       python3 \
       python3-distutils \

VERSION

@@ -1 +1 @@
-2.6.1
+2.7.0

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

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

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

test-configuration/test_config.py

@@ -2,3 +2,5 @@ LOGGING = {
     'version': 1,
     'disable_existing_loggers': True
 }
+
+DEFAULT_PERMISSIONS = {}