From 945f61e684fc502df6a476df042b2b00404d7374 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 May 2025 13:36:43 +0000 Subject: [PATCH 01/29] Update dependency django-auth-ldap to v5.2.0 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index b1a8304..831c49e 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -1,4 +1,4 @@ -django-auth-ldap==5.1.0 +django-auth-ldap==5.2.0 dulwich==0.22.8 python3-saml==1.16.0 --no-binary lxml From 4a2b9be52cab4ddad986221513fc728d46a980aa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 12 May 2025 12:54:48 +0000 Subject: [PATCH 02/29] Update dependency sentry-sdk to v2.28.0 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 831c49e..2e2e2a5 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.22.8 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.27.0 +sentry-sdk[django]==2.28.0 From 9748e5b9b77c328d2bb278ef5529c6cb65db0f6f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Jun 2025 12:41:10 +0000 Subject: [PATCH 03/29] Update dependency sentry-sdk to v2.30.0 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 2e2e2a5..ce980ac 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.22.8 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.28.0 +sentry-sdk[django]==2.30.0 From 0e7e68e153f7378fd1c634a6e80fbde627f94d94 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 21 Jun 2025 20:48:00 +0000 Subject: [PATCH 04/29] Update dependency dulwich to v0.23.0 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index ce980ac..799da56 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -1,5 +1,5 @@ django-auth-ldap==5.2.0 -dulwich==0.22.8 +dulwich==0.23.0 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec From 8e8e37fcc145fce6fa0a9402deeee690120bf7be Mon Sep 17 00:00:00 2001 From: Jens Rudolf <58146618+jensrudolf@users.noreply.github.com> Date: Mon, 23 Jun 2025 13:08:00 +0200 Subject: [PATCH 05/29] Add AUTH_LDAP_ALWAY_UPDATE_USER to ldap config This change exposes the Django setting AUTH_LDAP_ALWAYS_UPDATE_USER as environment variable to simplify deployments with readonly databases and LDAP based authentication as no extra file is required to be mounted into the container anymore. --- configuration/ldap/ldap_config.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configuration/ldap/ldap_config.py b/configuration/ldap/ldap_config.py index 82fad72..59e6aea 100644 --- a/configuration/ldap/ldap_config.py +++ b/configuration/ldap/ldap_config.py @@ -109,3 +109,6 @@ AUTH_LDAP_USER_ATTR_MAP = { "last_name": environ.get('AUTH_LDAP_ATTR_LASTNAME', 'sn'), "email": environ.get('AUTH_LDAP_ATTR_MAIL', 'mail') } + +# Update user object with the latest values from the LDAP directory every time the user logs in. +AUTH_LDAP_ALWAYS_UPDATE_USER = environ.get('AUTH_LDAP_ALWAYS_UPDATE_USER', 'True').lower() == 'true' From a0b6ce5acee11ea8e8e97d0c571a817420b9cd79 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 24 Jun 2025 19:28:55 +0000 Subject: [PATCH 06/29] Update dependency sentry-sdk to v2.31.0 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 799da56..556d52e 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.23.0 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.30.0 +sentry-sdk[django]==2.31.0 From b845a0f45fd69cdffcb98370b606fd4b5f0e4804 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Jun 2025 08:38:17 +0000 Subject: [PATCH 07/29] Update dependency sentry-sdk to v2.32.0 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 556d52e..09e1afa 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.23.0 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.31.0 +sentry-sdk[django]==2.32.0 From bc4131017939515bc6bef6e32b2590604c65ce57 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Jun 2025 23:37:38 +0000 Subject: [PATCH 08/29] Update dependency dulwich to v0.23.1 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 09e1afa..6bb19b2 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -1,5 +1,5 @@ django-auth-ldap==5.2.0 -dulwich==0.23.0 +dulwich==0.23.1 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec From 21232c8ce10b97c4c7aa3fad3559a4c9cebfee5f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Jul 2025 13:43:56 +0000 Subject: [PATCH 09/29] Update dependency dulwich to v0.23.2 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 6bb19b2..b5dcc0a 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -1,5 +1,5 @@ django-auth-ldap==5.2.0 -dulwich==0.23.1 +dulwich==0.23.2 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec From 3320c5d82fb958bdc76177109e40313a54b45439 Mon Sep 17 00:00:00 2001 From: dawnstrider Date: Mon, 7 Jul 2025 23:08:49 +0200 Subject: [PATCH 10/29] Fixed typo for BUILDX_PLATFORM variable The help prints the variable name as BUILDX_PLATFORMS whereas the code uses BUILDX_PLATFORM --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index a7ac817..c12fbe4 100755 --- a/build.sh +++ b/build.sh @@ -62,7 +62,7 @@ DOCKERFILE The name of Dockerfile to use. DOCKER_FROM The base image to use. ${_GREEN}Default:${_CLEAR} 'ubuntu:24.04' -BUILDX_PLATFORMS +BUILDX_PLATFORM Specifies the platform(s) to build the image for. ${_CYAN}Example:${_CLEAR} 'linux/amd64,linux/arm64' ${_GREEN}Default:${_CLEAR} 'linux/amd64' From f69d214b9a7fd1273e340eb98df5b5a8380c0b9f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 15 Jul 2025 15:30:00 +0000 Subject: [PATCH 11/29] Update dependency sentry-sdk to v2.33.0 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index b5dcc0a..37c8f53 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.23.2 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.32.0 +sentry-sdk[django]==2.33.0 From 658fc00a8691e790e3e49f55992c4d36d727a846 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Jul 2025 23:45:53 +0000 Subject: [PATCH 12/29] Update ghcr.io/astral-sh/uv Docker tag to v0.8 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ffb3682..ea17f07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FROM FROM ${FROM} AS builder -COPY --from=ghcr.io/astral-sh/uv:0.7 /uv /usr/local/bin/ +COPY --from=ghcr.io/astral-sh/uv:0.8 /uv /usr/local/bin/ RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update -qq \ && apt-get upgrade \ From 950b74e3e60c4c62be50c5de38bb7f7b1a3e4607 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Jul 2025 15:59:13 +0000 Subject: [PATCH 13/29] Update super-linter/super-linter action to v8 --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c4f22d6..3d27f13 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -29,7 +29,7 @@ jobs: # list of changed files within `super-linter` fetch-depth: 0 - name: Lint Code Base - uses: super-linter/super-linter@v7 + uses: super-linter/super-linter@v8 env: DEFAULT_BRANCH: develop GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From f9f5ae70f9ca2882392b3c747bb4c1984c24816d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Jul 2025 19:45:47 +0000 Subject: [PATCH 14/29] Update dependency sentry-sdk to v2.33.1 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 37c8f53..36d7b3b 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.23.2 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.33.0 +sentry-sdk[django]==2.33.1 From e58c7358251413f37b0095a772e6b0dce4b892a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 22 Jul 2025 18:24:34 +0000 Subject: [PATCH 15/29] Update dependency sentry-sdk to v2.33.2 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 36d7b3b..480b5fd 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.23.2 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.33.1 +sentry-sdk[django]==2.33.2 From d1ef353b31fc512202d6552665924e461377baea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 29 Jul 2025 18:12:22 +0000 Subject: [PATCH 16/29] Update dependency sentry-sdk to v2.34.0 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 480b5fd..3eaa5f0 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.23.2 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.33.2 +sentry-sdk[django]==2.34.0 From 7b10cf0933e8dd7e6ce8934c8821571bf7dcb698 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 12:45:32 +0000 Subject: [PATCH 17/29] Update dependency sentry-sdk to v2.34.1 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 3eaa5f0..18c20de 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.23.2 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.34.0 +sentry-sdk[django]==2.34.1 From f03200b88bd65dc6bf2999429e4a90bdf4c4fd0b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Aug 2025 06:47:14 +0000 Subject: [PATCH 18/29] Update dependency dulwich to v0.24.0 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 18c20de..f4e6e60 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -1,5 +1,5 @@ django-auth-ldap==5.2.0 -dulwich==0.23.2 +dulwich==0.24.0 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec From 68fd99c34a88c3fd926396d78af3a1af2980ed5d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Aug 2025 14:59:00 +0000 Subject: [PATCH 19/29] Update dependency dulwich to v0.24.1 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index f4e6e60..0865c1a 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -1,5 +1,5 @@ django-auth-ldap==5.2.0 -dulwich==0.24.0 +dulwich==0.24.1 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec From 56e8af355ed01e0f54a33bc55cecda2f66d00360 Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Sat, 2 Aug 2025 10:00:17 +0200 Subject: [PATCH 20/29] Fixed build for Netbox feature branch --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ea17f07..e22c55d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -89,7 +89,7 @@ WORKDIR /opt/netbox/netbox # Must set permissions for '/opt/netbox/netbox/media' directory # to g+w so that pictures can be uploaded to netbox. -RUN mkdir -p static /opt/unit/state/ /opt/unit/tmp/ \ +RUN mkdir -p static media /opt/unit/state/ /opt/unit/tmp/ \ && chown -R unit:root /opt/unit/ media reports scripts \ && chmod -R g+w /opt/unit/ media reports scripts \ && cd /opt/netbox/ && SECRET_KEY="dummyKeyWithMinimumLength-------------------------" /opt/netbox/venv/bin/python -m mkdocs build \ From 109ef8afd2617415352954dd00cc8149c76a583f Mon Sep 17 00:00:00 2001 From: Kelly Shutt Date: Mon, 4 Aug 2025 13:10:06 -0400 Subject: [PATCH 21/29] Update DATABASES syntax. --- configuration/configuration.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/configuration/configuration.py b/configuration/configuration.py index 577c3f4..6125e2b 100644 --- a/configuration/configuration.py +++ b/configuration/configuration.py @@ -64,19 +64,21 @@ if '*' not in ALLOWED_HOSTS and 'localhost' not in ALLOWED_HOSTS: # PostgreSQL database configuration. See the Django documentation for a complete list of available parameters: # https://docs.djangoproject.com/en/stable/ref/settings/#databases -DATABASE = { - 'NAME': environ.get('DB_NAME', 'netbox'), # Database name - 'USER': environ.get('DB_USER', ''), # PostgreSQL username - 'PASSWORD': _read_secret('db_password', environ.get('DB_PASSWORD', '')), - # PostgreSQL password - 'HOST': environ.get('DB_HOST', 'localhost'), # Database server - 'PORT': environ.get('DB_PORT', ''), # Database port (leave blank for default) - 'OPTIONS': {'sslmode': environ.get('DB_SSLMODE', 'prefer')}, - # Database connection SSLMODE - 'CONN_MAX_AGE': _environ_get_and_map('DB_CONN_MAX_AGE', '300', _AS_INT), - # Max database connection age - 'DISABLE_SERVER_SIDE_CURSORS': _environ_get_and_map('DB_DISABLE_SERVER_SIDE_CURSORS', 'False', _AS_BOOL), - # Disable the use of server-side cursors transaction pooling +DATABASES = { + 'default': { + 'NAME': environ.get('DB_NAME', 'netbox'), # Database name + 'USER': environ.get('DB_USER', ''), # PostgreSQL username + 'PASSWORD': _read_secret('db_password', environ.get('DB_PASSWORD', '')), + # PostgreSQL password + 'HOST': environ.get('DB_HOST', 'localhost'), # Database server + 'PORT': environ.get('DB_PORT', ''), # Database port (leave blank for default) + 'OPTIONS': {'sslmode': environ.get('DB_SSLMODE', 'prefer')}, + # Database connection SSLMODE + 'CONN_MAX_AGE': _environ_get_and_map('DB_CONN_MAX_AGE', '300', _AS_INT), + # Max database connection age + 'DISABLE_SERVER_SIDE_CURSORS': _environ_get_and_map('DB_DISABLE_SERVER_SIDE_CURSORS', 'False', _AS_BOOL), + # Disable the use of server-side cursors transaction pooling + } } # Redis database settings. Redis is used for caching and for queuing background tasks such as webhook events. A separate From e9b6231d03145855ea598a6b214b09bad1f93890 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Aug 2025 15:30:00 +0000 Subject: [PATCH 22/29] Update actions/checkout action to v5 --- .github/workflows/push.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 3d27f13..e5aaf69 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -23,7 +23,7 @@ jobs: packages: read statuses: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: # Full git history is needed to get a proper # list of changed files within `super-linter` @@ -70,7 +70,7 @@ jobs: steps: - id: git-checkout name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - id: buildx-setup name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 71b718c..2d83729 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: steps: - id: source-checkout name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: ${{ matrix.build.branch }} - id: set-netbox-docker-version From 71ebfca443f0345a812c40b5fc7bb914a5074c4a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Aug 2025 21:03:27 +0000 Subject: [PATCH 23/29] Update dependency sentry-sdk to v2.35.0 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 0865c1a..d03d874 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.24.1 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.34.1 +sentry-sdk[django]==2.35.0 From 67eff20f7daa55dad1a208e169f695b7464e80fb Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Tue, 5 Aug 2025 08:06:22 +0200 Subject: [PATCH 24/29] Housekeeping --- Dockerfile | 1 - docker-compose.test.yml | 9 --------- docker-compose.yml | 12 ------------ docker/housekeeping.sh | 8 -------- env/netbox.env | 1 - 5 files changed, 31 deletions(-) delete mode 100755 docker/housekeeping.sh diff --git a/Dockerfile b/Dockerfile index e22c55d..452b44c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -79,7 +79,6 @@ COPY ${NETBOX_PATH} /opt/netbox COPY docker/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py COPY docker/ldap_config.docker.py /opt/netbox/netbox/netbox/ldap_config.py COPY docker/docker-entrypoint.sh /opt/netbox/docker-entrypoint.sh -COPY docker/housekeeping.sh /opt/netbox/housekeeping.sh COPY docker/launch-netbox.sh /opt/netbox/launch-netbox.sh COPY configuration/ /etc/netbox/config/ COPY docker/nginx-unit.json /etc/unit/ diff --git a/docker-compose.test.yml b/docker-compose.test.yml index bbc139c..9388022 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -28,15 +28,6 @@ services: start_period: 40s timeout: 3s interval: 15s - netbox-housekeeping: - <<: *netbox - command: - - /opt/netbox/housekeeping.sh - healthcheck: - test: ps -aux | grep -v grep | grep -q housekeeping || exit 1 - start_period: 40s - timeout: 3s - interval: 15s postgres: image: docker.io/postgres:17-alpine diff --git a/docker-compose.yml b/docker-compose.yml index 3ba2fd4..8ac3358 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,18 +31,6 @@ services: start_period: 20s timeout: 3s interval: 15s - netbox-housekeeping: - <<: *netbox - depends_on: - netbox: - condition: service_healthy - command: - - /opt/netbox/housekeeping.sh - healthcheck: - test: ps -aux | grep -v grep | grep -q housekeeping || exit 1 - start_period: 20s - timeout: 3s - interval: 15s # postgres postgres: diff --git a/docker/housekeeping.sh b/docker/housekeeping.sh deleted file mode 100755 index 47a4a3d..0000000 --- a/docker/housekeeping.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -SLEEP_SECONDS=${HOUSEKEEPING_INTERVAL:=86400} -echo "Interval set to ${SLEEP_SECONDS} seconds" -while true; do - date - /opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py housekeeping - sleep "${SLEEP_SECONDS}s" -done diff --git a/env/netbox.env b/env/netbox.env index ca22549..c89844f 100644 --- a/env/netbox.env +++ b/env/netbox.env @@ -15,7 +15,6 @@ EMAIL_USERNAME=netbox EMAIL_USE_SSL=false EMAIL_USE_TLS=false GRAPHQL_ENABLED=true -HOUSEKEEPING_INTERVAL=86400 MEDIA_ROOT=/opt/netbox/netbox/media METRICS_ENABLED=false REDIS_CACHE_DATABASE=1 From af562671e2c515fdf9b715ceec47fec6c8414702 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Aug 2025 15:54:13 +0000 Subject: [PATCH 25/29] Update dependency sentry-sdk to v2.35.1 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index d03d874..0f4b593 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.24.1 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.35.0 +sentry-sdk[django]==2.35.1 From 8dac9f2dc7c7a371748e6a5ce145da2a3016ed8c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Sep 2025 21:58:31 +0000 Subject: [PATCH 26/29] Update dependency sentry-sdk to v2.35.2 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 0f4b593..0867083 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.24.1 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.35.1 +sentry-sdk[django]==2.35.2 From e61aba8388849b7ff90254e635f178acbfd1a754 Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Wed, 3 Sep 2025 07:50:41 +0200 Subject: [PATCH 27/29] Preparation for 3.4.0 --- VERSION | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 0fa4ae4..1809198 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.3.0 \ No newline at end of file +3.4.0 diff --git a/docker-compose.yml b/docker-compose.yml index 8ac3358..a5e78d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: netbox: &netbox - image: docker.io/netboxcommunity/netbox:${VERSION-v4.3-3.3.0} + image: docker.io/netboxcommunity/netbox:${VERSION-v4.4-3.4.0} depends_on: - postgres - redis From 1b0da4048bd74c3187b406dfd670ffc5df93c6db Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Wed, 3 Sep 2025 07:59:56 +0200 Subject: [PATCH 28/29] Disable Trivy for now --- .github/workflows/push.yml | 1 + VERSION | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index e5aaf69..73b6a9c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -40,6 +40,7 @@ jobs: VALIDATE_DOCKERFILE: false VALIDATE_GITLEAKS: false VALIDATE_JSCPD: false + VALIDATE_TRIVY: false FILTER_REGEX_EXCLUDE: (.*/)?(LICENSE|configuration/.*) EDITORCONFIG_FILE_NAME: .editorconfig-checker.json DOCKERFILE_HADOLINT_FILE_NAME: .hadolint.yaml diff --git a/VERSION b/VERSION index 1809198..fbcbf73 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.4.0 +3.4.0 \ No newline at end of file From e9a8e14aa8511ec82f414723bb64546a113fa33f Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Wed, 3 Sep 2025 08:10:15 +0200 Subject: [PATCH 29/29] Disable zizmor for now --- .github/workflows/push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 73b6a9c..a4833e1 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -41,6 +41,7 @@ jobs: VALIDATE_GITLEAKS: false VALIDATE_JSCPD: false VALIDATE_TRIVY: false + VALIDATE_GITHUB_ACTIONS_ZIZMOR: false FILTER_REGEX_EXCLUDE: (.*/)?(LICENSE|configuration/.*) EDITORCONFIG_FILE_NAME: .editorconfig-checker.json DOCKERFILE_HADOLINT_FILE_NAME: .hadolint.yaml