Merge pull request #1558 from netbox-community/develop

Version 3.4.2
Preparation for 3.4.2
2026-02-19 12:20:11 +00:00 · 2025-11-10 12:55:32 +01:00 · 2025-11-10 10:28:40 +01:00 · 2025-11-10 10:02:13 +01:00 · 2025-11-10 10:01:53 +01:00 · 2025-10-30 03:30:40 +00:00
9 changed files with 20 additions and 12 deletions
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -36,12 +36,13 @@ jobs:
          SUPPRESS_POSSUM: true
          LINTER_RULES_PATH: /
          VALIDATE_ALL_CODEBASE: false
+          VALIDATE_BIOME_FORMAT: false
          VALIDATE_CHECKOV: false
          VALIDATE_DOCKERFILE: false
+          VALIDATE_GITHUB_ACTIONS_ZIZMOR: 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/2
+++ b/2
@@ -1,7 +1,7 @@
 ARG FROM
 FROM ${FROM} AS builder

-COPY --from=ghcr.io/astral-sh/uv:0.8 /uv /usr/local/bin/
+COPY --from=ghcr.io/astral-sh/uv:0.9 /uv /usr/local/bin/
 RUN export DEBIAN_FRONTEND=noninteractive \
    && apt-get update -qq \
    && apt-get upgrade \
--- a/README.md
+++ b/README.md
@@ -39,12 +39,9 @@ There is a more complete [_Getting Started_ guide on our wiki][wiki-getting-star
 ```bash
 git clone -b release https://github.com/netbox-community/netbox-docker.git
 cd netbox-docker
-tee docker-compose.override.yml <<EOF
-services:
-  netbox:
-    ports:
-      - 8000:8080
-EOF
+# Copy the example override file
+cp docker-compose.override.yml.example docker-compose.override.yml
+# Read and edit the file to your liking
 docker compose pull
 docker compose up
 ```
--- a/2
+++ b/2
@@ -1 +1 @@
-3.4.1
+3.4.2
--- a/configuration/configuration.py
+++ b/configuration/configuration.py
@@ -116,6 +116,11 @@ REDIS = {
 # https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-SECRET_KEY
 SECRET_KEY = _read_secret('secret_key', environ.get('SECRET_KEY', ''))

+API_TOKEN_PEPPERS = {}
+if api_token_pepper := _read_secret('api_token_pepper_1', environ.get('API_TOKEN_PEPPER_1', '')):
+    API_TOKEN_PEPPERS.update({1: api_token_pepper})
+
+

 #########################
 #                       #
--- a/docker/launch-netbox.sh
+++ b/docker/launch-netbox.sh
@@ -36,7 +36,7 @@ load_configuration() {
      http://localhost/config
  )
  if [ "$RESP_CODE" != "200" ]; then
-    echo "⚠️ Could no load Unit configuration"
+    echo "⚠️ Could not load Unit configuration"
    kill "$(cat /opt/unit/unit.pid)"
    return 1
  fi
--- a/env/netbox.env
+++ b/env/netbox.env
@@ -1,3 +1,4 @@
+API_TOKEN_PEPPER_1=Qy+F=OTeGskWQ(wTMgjc+NPPlz6YwFXY=KHIIg=wpYXT&e(6u8
 CORS_ORIGIN_ALLOW_ALL=True
 DB_HOST=postgres
 DB_NAME=netbox
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,6 +1,6 @@
 django-auth-ldap==5.2.0
-dulwich==0.24.1
+dulwich==0.24.8
 python3-saml==1.16.0
 --no-binary lxml
 --no-binary xmlsec
-sentry-sdk[django]==2.39.0
+sentry-sdk[django]==2.43.0
--- a/test-configuration/test_config.py
+++ b/test-configuration/test_config.py
@@ -10,3 +10,7 @@ PLUGINS = [
 ALLOW_TOKEN_RETRIEVAL = True

 DEFAULT_PERMISSIONS = {}
+
+API_TOKEN_PEPPERS = {
+    1: 'TEST-VALUE-DO-NOT-USE-TEST-VALUE-DO-NOT-USE-TEST-VALUE-DO-NOT-USE',
+}
Author	SHA1	Message	Date
Tobias Genannt	7d6f00662c	Merge pull request #1558 from netbox-community/develop Version 3.4.2	2025-11-10 12:55:32 +01:00
Tobias Genannt	4965e7e988	Preparation for 3.4.2	2025-11-10 10:28:40 +01:00
Tobias Genannt	d194cf7fff	Merge pull request #1554 from netbox-community/renovate/sentry-sdk-2.x Update dependency sentry-sdk to v2.43.0	2025-11-10 10:02:13 +01:00
Tobias Genannt	0439c610de	Merge pull request #1555 from netbox-community/renovate/dulwich-0.x Update dependency dulwich to v0.24.8	2025-11-10 10:01:53 +01:00
renovate[bot]	35473e755b	Update dependency dulwich to v0.24.8	2025-10-30 03:30:40 +00:00
renovate[bot]	3f0f4e7160	Update dependency sentry-sdk to v2.43.0	2025-10-29 19:47:17 +00:00
Tobias Genannt	10a57990e2	Merge pull request #1553 from netbox-community/renovate/dulwich-0.x Update dependency dulwich to v0.24.7	2025-10-23 15:18:16 +02:00
renovate[bot]	2d6d5058fe	Update dependency dulwich to v0.24.7	2025-10-23 12:46:08 +00:00
Tobias Genannt	f6cab681b4	Merge pull request #1547 from WillNilges/patch-1 Correct typo in launch-netbox.sh	2025-10-22 14:52:48 +02:00
Tobias Genannt	4bdf66157b	Merge pull request #1550 from netbox-community/renovate/sentry-sdk-2.x Update dependency sentry-sdk to v2.42.1	2025-10-22 14:20:41 +02:00
renovate[bot]	73bbf17d6b	Update dependency sentry-sdk to v2.42.1	2025-10-20 15:32:40 +00:00
Tobias Genannt	9b2793a808	Merge pull request #1548 from netbox-community/renovate/dulwich-0.x Update dependency dulwich to v0.24.6	2025-10-19 15:31:13 +02:00
renovate[bot]	b0aad0dfda	Update dependency dulwich to v0.24.6	2025-10-19 12:45:34 +00:00
Willard Nilges	eb2822a978	Fix typo in error message for Unit configuration	2025-10-19 01:17:23 -04:00
Tobias Genannt	016a2ab4fe	Merge pull request #1542 from netbox-community/renovate/dulwich-0.x Update dependency dulwich to v0.24.5	2025-10-16 19:39:19 +02:00
renovate[bot]	56d27f84a7	Update dependency dulwich to v0.24.5	2025-10-16 14:11:49 +00:00
Tobias Genannt	24641dabc5	Merge pull request #1540 from netbox-community/renovate/sentry-sdk-2.x Update dependency sentry-sdk to v2.42.0	2025-10-15 13:16:39 +02:00
renovate[bot]	07258394d1	Update dependency sentry-sdk to v2.42.0	2025-10-15 10:43:52 +00:00
Tobias Genannt	b6cc5e3c06	Merge pull request #1537 from netbox-community/renovate/dulwich-0.x Update dependency dulwich to v0.24.4	2025-10-15 06:43:09 +02:00
renovate[bot]	95bcfeb69d	Update dependency dulwich to v0.24.4	2025-10-14 21:08:52 +00:00
Tobias Genannt	c10d4e71c7	Merge pull request #1533 from netbox-community/renovate/sentry-sdk-2.x Update dependency sentry-sdk to v2.41.0	2025-10-14 07:17:32 +02:00
renovate[bot]	85615a9bea	Update dependency sentry-sdk to v2.41.0	2025-10-14 04:46:28 +00:00
Tobias Genannt	1abb784f9b	Merge pull request #1535 from netbox-community/renovate/dulwich-0.x Update dependency dulwich to v0.24.3	2025-10-14 06:45:35 +02:00
renovate[bot]	f89f907408	Update dependency dulwich to v0.24.3	2025-10-14 01:45:18 +00:00
Tobias Genannt	6b7121564b	Merge pull request #1532 from tobiasge/new-api-token Support new API_TOKEN format	2025-10-10 11:36:01 +02:00
Tobias Genannt	1f0ef020a9	Support new API_TOKEN format Allows configuration the new API_TOKEN_PEPPERS setting from an ENV variable or secret file. Feature request: https://github.com/netbox-community/netbox/issues/20210 Pull request: https://github.com/netbox-community/netbox/pull/20477	2025-10-08 08:26:27 +02:00
Tobias Genannt	f07c9d533d	Merge pull request #1531 from netbox-community/renovate/ghcr.io-astral-sh-uv-0.x Update ghcr.io/astral-sh/uv Docker tag to v0.9	2025-10-08 07:29:21 +02:00
renovate[bot]	7067475a81	Update ghcr.io/astral-sh/uv Docker tag to v0.9	2025-10-08 05:08:30 +00:00
Tobias Genannt	0072d59ea2	Merge pull request #1528 from netbox-community/renovate/sentry-sdk-2.x Update dependency sentry-sdk to v2.40.0	2025-10-06 15:59:15 +02:00
renovate[bot]	88bc5cf8d6	Update dependency sentry-sdk to v2.40.0	2025-10-06 13:37:57 +00:00
Tobias Genannt	993628d8f0	Merge pull request #1525 from netbox-community/renovate/dulwich-0.x Update dependency dulwich to v0.24.2	2025-09-26 13:04:17 +02:00
renovate[bot]	dbc1b37cf7	Update dependency dulwich to v0.24.2	2025-09-26 10:42:24 +00:00
Tobias Genannt	7aeec92141	Merge pull request #1479 from tobiasge/update-readme Use our example file in the Readme	2025-09-26 12:41:55 +02:00
Tobias Genannt	c8d766a95b	Use our example file in the Readme	2025-07-08 07:45:38 +02:00
@@ -1 +1 @@
 .4.1
 .4.2