Prepare for Netbox 3.6

This commit is contained in:
Tobias Genannt 2023-07-07 08:12:33 +02:00
parent f703bba5e1
commit 44d0f47fb5
6 changed files with 9 additions and 6 deletions

View File

@ -31,8 +31,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \
ARG NETBOX_PATH ARG NETBOX_PATH
COPY ${NETBOX_PATH}/requirements.txt requirements-container.txt / COPY ${NETBOX_PATH}/requirements.txt requirements-container.txt /
RUN \ RUN \
# We compile 'psycopg2' in the build process # We compile 'psycopg' in the build process
sed -i -e '/psycopg2-binary/d' /requirements.txt && \ sed -i -e '/psycopg/d' /requirements.txt && \
# Gunicorn is not needed because we use Nginx Unit # Gunicorn is not needed because we use Nginx Unit
sed -i -e '/gunicorn/d' /requirements.txt && \ 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 # We need 'social-auth-core[all]' in the Docker image. But if we put it in our own requirements-container.txt

View File

@ -1 +1 @@
2.6.1 2.7.0

View File

@ -12,7 +12,7 @@ services:
env_file: env/netbox.env env_file: env/netbox.env
user: 'unit:root' user: 'unit:root'
volumes: 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: healthcheck:
start_period: ${NETBOX_START_PERIOD-120s} start_period: ${NETBOX_START_PERIOD-120s}
timeout: 3s timeout: 3s

View File

@ -1,7 +1,7 @@
version: '3.4' version: '3.4'
services: services:
netbox: &netbox 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: depends_on:
- postgres - postgres
- redis - redis

View File

@ -1,4 +1,5 @@
django-auth-ldap==4.5.0 django-auth-ldap==4.5.0
django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.13.2 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 python3-saml==1.15.0

View File

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