Merge pull request #1524 from netbox-community/develop

Version 3.4.1
Preparation for 3.4.1
2025-09-26 11:04:31 +02:00 · 2025-09-26 09:47:06 +02:00 · 2025-09-26 09:25:28 +02:00 · 2025-09-25 15:14:25 +02:00 · 2025-09-25 12:49:11 +00:00 · 2025-09-16 06:39:49 +02:00
10 changed files with 12 additions and 36 deletions
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -40,6 +40,8 @@ jobs:
          VALIDATE_DOCKERFILE: false
          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
--- a/1
+++ b/1
@@ -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/
--- a/2
+++ b/2
@@ -1 +1 @@
-3.3.0
+3.4.1
--- a/build.sh
+++ b/build.sh
@@ -223,7 +223,7 @@ fi
 ###
 # Variables for labelling the docker image
 ###
-BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M+00:00')"
+BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%S+00:00')"

 if [ -d ".git" ] && [ -z "${SKIP_GIT}" ]; then
  GIT_REF="$(git rev-parse HEAD)"
--- 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
--- 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.1}
    depends_on:
      - postgres
      - redis
@@ -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:
--- a/docker/housekeeping.sh
+++ b/docker/housekeeping.sh
@@ -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
--- a/docker/nginx-unit.json
+++ b/docker/nginx-unit.json
@@ -73,5 +73,10 @@
      }
    }
  },
-  "access_log": "/dev/stdout"
+  "access_log": "/dev/stdout",
+  "settings": {
+    "http": {
+      "max_body_size": 104857600
+    }
+  }
 }
--- 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
--- 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.39.0
Author	SHA1	Message	Date
Tobias Genannt	ae5f7d2419	Merge pull request #1524 from netbox-community/develop Version 3.4.1	2025-09-26 11:04:31 +02:00
Tobias Genannt	a945236c81	Preparation for 3.4.1	2025-09-26 09:47:06 +02:00
Tobias Genannt	481a102d30	Merge pull request #1515 from alexanderhofstaetter/patch-1 Increase default NGINX Unit request body limit to 100 MB in nginx settings	2025-09-26 09:25:28 +02:00
Tobias Genannt	81fb62ecef	Merge pull request #1519 from netbox-community/renovate/sentry-sdk-2.x Update dependency sentry-sdk to v2.39.0	2025-09-25 15:14:25 +02:00
renovate[bot]	2c49500e8d	Update dependency sentry-sdk to v2.39.0	2025-09-25 12:49:11 +00:00
Tobias Genannt	c16c79ff16	Merge pull request #1517 from netbox-community/renovate/sentry-sdk-2.x Update dependency sentry-sdk to v2.38.0	2025-09-16 06:39:49 +02:00
renovate[bot]	c05e838edc	Update dependency sentry-sdk to v2.38.0	2025-09-15 23:32:23 +00:00
Alexander Hofstätter	e62af8be76	Increase default NGINX Unit request body limit to 100 MB in docker/nginx-unit.json The current NGINX Unit configuration in netbox-docker implicitly limits incoming HTTP request bodies to roughly 2.5 MB. This causes file uploads (custom scripts, attachments, etc.) to fail with HTTP 413 before they reach Django, even when NetBox settings like FILE_UPLOAD_MAX_MEMORY_SIZE are raised. This change adds a settings block to docker/nginx-unit.json to raise the default limit: { "settings": { "http": { "max_body_size": 104857600 } } } With this change, new deployments can handle uploads up to 100 MB out of the box, aligning the container default with the capabilities of NetBox core and preventing unexpected 413 errors. Fixes: https://github.com/netbox-community/netbox-docker/issues/897	2025-09-13 13:06:29 +02:00
Tobias Genannt	a229603d90	Merge pull request #1513 from netbox-community/renovate/sentry-sdk-2.x Update dependency sentry-sdk to v2.37.1	2025-09-09 17:08:38 +02:00
renovate[bot]	942fc04776	Update dependency sentry-sdk to v2.37.1	2025-09-09 14:47:12 +00:00
Tobias Genannt	b76bd3d780	Merge pull request #1511 from LeoColomb/patch-1 Update `BUILD_DATE` format to include seconds	2025-09-08 08:12:34 +02:00
Léo Colombaro	4744eeb3ef	Update BUILD_DATE format to include seconds * Comply with all standards (RFC 3339, ISO 8601, and HTML). * Reduce ambiguity. * Ensure a fully compliant `org.opencontainers.image.created`. (fix artifacthub error)	2025-09-07 14:41:44 +02:00
Tobias Genannt	bdea0cf05a	Merge pull request #1510 from netbox-community/renovate/sentry-sdk-2.x Update dependency sentry-sdk to v2.37.0	2025-09-05 15:21:12 +02:00
renovate[bot]	76f670faaa	Update dependency sentry-sdk to v2.37.0	2025-09-05 12:59:40 +00:00
Tobias Genannt	263fcf35bf	Merge pull request #1509 from netbox-community/renovate/sentry-sdk-2.x Update dependency sentry-sdk to v2.36.0	2025-09-04 12:17:06 +02:00
renovate[bot]	fb1cfd880a	Update dependency sentry-sdk to v2.36.0	2025-09-04 09:54:49 +00:00
Tobias Genannt	b1394ff9cb	Merge pull request #1508 from netbox-community/develop Version 3.4.0	2025-09-04 09:59:09 +02:00
Tobias Genannt	e9a8e14aa8	Disable zizmor for now	2025-09-03 08:10:15 +02:00
Tobias Genannt	1b0da4048b	Disable Trivy for now	2025-09-03 07:59:56 +02:00
Tobias Genannt	e61aba8388	Preparation for 3.4.0	2025-09-03 07:50:41 +02:00
Tobias Genannt	c4f90b7b34	Merge pull request #1507 from netbox-community/renovate/sentry-sdk-2.x Update dependency sentry-sdk to v2.35.2	2025-09-02 07:07:46 +02:00
renovate[bot]	8dac9f2dc7	Update dependency sentry-sdk to v2.35.2	2025-09-01 21:58:31 +00:00
Tobias Genannt	51947e4c52	Merge pull request #1506 from netbox-community/renovate/sentry-sdk-2.x Update dependency sentry-sdk to v2.35.1	2025-08-26 18:14:55 +02:00
renovate[bot]	af562671e2	Update dependency sentry-sdk to v2.35.1	2025-08-26 15:54:13 +00:00
Tobias Genannt	b97c177df8	Merge pull request #1501 from tobiasge/remove-housekeeping-container Housekeeping	2025-08-18 10:49:53 +02:00
Tobias Genannt	67eff20f7d	Housekeeping	2025-08-18 08:45:47 +02:00
Tobias Genannt	c49af09fa5	Merge pull request #1499 from netbox-community/renovate/sentry-sdk-2.x Update dependency sentry-sdk to v2.35.0	2025-08-15 06:49:39 +02:00
renovate[bot]	71ebfca443	Update dependency sentry-sdk to v2.35.0	2025-08-14 21:03:27 +00:00
@@ -1 +1 @@
 .3.0
 .4.1