Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
c8d766a
Use our example file in the Readme
tobiasge Jul 8, 2025
7aeec92
Merge pull request #1479 from tobiasge/update-readme
tobiasge Sep 26, 2025
dbc1b37
Update dependency dulwich to v0.24.2
renovate[bot] Sep 26, 2025
993628d
Merge pull request #1525 from netbox-community/renovate/dulwich-0.x
tobiasge Sep 26, 2025
88bc5cf
Update dependency sentry-sdk to v2.40.0
renovate[bot] Oct 6, 2025
0072d59
Merge pull request #1528 from netbox-community/renovate/sentry-sdk-2.x
tobiasge Oct 6, 2025
7067475
Update ghcr.io/astral-sh/uv Docker tag to v0.9
renovate[bot] Oct 8, 2025
f07c9d5
Merge pull request #1531 from netbox-community/renovate/ghcr.io-astra…
tobiasge Oct 8, 2025
1f0ef02
Support new API_TOKEN format
tobiasge Oct 8, 2025
6b71215
Merge pull request #1532 from tobiasge/new-api-token
tobiasge Oct 10, 2025
f89f907
Update dependency dulwich to v0.24.3
renovate[bot] Oct 14, 2025
1abb784
Merge pull request #1535 from netbox-community/renovate/dulwich-0.x
tobiasge Oct 14, 2025
85615a9
Update dependency sentry-sdk to v2.41.0
renovate[bot] Oct 14, 2025
c10d4e7
Merge pull request #1533 from netbox-community/renovate/sentry-sdk-2.x
tobiasge Oct 14, 2025
95bcfeb
Update dependency dulwich to v0.24.4
renovate[bot] Oct 14, 2025
b6cc5e3
Merge pull request #1537 from netbox-community/renovate/dulwich-0.x
tobiasge Oct 15, 2025
0725839
Update dependency sentry-sdk to v2.42.0
renovate[bot] Oct 15, 2025
24641da
Merge pull request #1540 from netbox-community/renovate/sentry-sdk-2.x
tobiasge Oct 15, 2025
56d27f8
Update dependency dulwich to v0.24.5
renovate[bot] Oct 16, 2025
016a2ab
Merge pull request #1542 from netbox-community/renovate/dulwich-0.x
tobiasge Oct 16, 2025
eb2822a
Fix typo in error message for Unit configuration
WillNilges Oct 19, 2025
b0aad0d
Update dependency dulwich to v0.24.6
renovate[bot] Oct 19, 2025
9b2793a
Merge pull request #1548 from netbox-community/renovate/dulwich-0.x
tobiasge Oct 19, 2025
73bbf17
Update dependency sentry-sdk to v2.42.1
renovate[bot] Oct 20, 2025
4bdf661
Merge pull request #1550 from netbox-community/renovate/sentry-sdk-2.x
tobiasge Oct 22, 2025
f6cab68
Merge pull request #1547 from WillNilges/patch-1
tobiasge Oct 22, 2025
2d6d505
Update dependency dulwich to v0.24.7
renovate[bot] Oct 23, 2025
10a5799
Merge pull request #1553 from netbox-community/renovate/dulwich-0.x
tobiasge Oct 23, 2025
3f0f4e7
Update dependency sentry-sdk to v2.43.0
renovate[bot] Oct 29, 2025
35473e7
Update dependency dulwich to v0.24.8
renovate[bot] Oct 30, 2025
0439c61
Merge pull request #1555 from netbox-community/renovate/dulwich-0.x
tobiasge Nov 10, 2025
d194cf7
Merge pull request #1554 from netbox-community/renovate/sentry-sdk-2.x
tobiasge Nov 10, 2025
4965e7e
Preparation for 3.4.2
tobiasge Nov 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.1
3.4.2
5 changes: 5 additions & 0 deletions configuration/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,11 @@ def _environ_get_and_map(variable_name: str, default: str | None = None, map_fn:
# 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})



#########################
# #
Expand Down
2 changes: 1 addition & 1 deletion docker/launch-netbox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions env/netbox.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions requirements-container.txt
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions test-configuration/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@
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',
}