dan
/
netbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: dan:c49af09fa586b07ab72da19b9edf353a2f9cb54c
Branches Tags
dan:release
...
compare: dan:b1394ff9cb1b96ec1cb0d9f6162a07bf8eff92ad
Branches Tags
dan:release

10 Commits
c49af09fa5 ... b1394ff9cb

Author SHA1 Message Date
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
8 changed files with 5 additions and 34 deletions
Show Stats Expand all files Collapse all files

2
.github/workflows/push.yml vendored
View File

@ -40,6 +40,8 @@ jobs:
VALIDATE_DOCKERFILE: false VALIDATE_DOCKERFILE: false
VALIDATE_GITLEAKS: false VALIDATE_GITLEAKS: false
VALIDATE_JSCPD: false VALIDATE_JSCPD: false
VALIDATE_TRIVY: false
VALIDATE_GITHUB_ACTIONS_ZIZMOR: false
FILTER_REGEX_EXCLUDE: (.*/)?(LICENSE|configuration/.*) FILTER_REGEX_EXCLUDE: (.*/)?(LICENSE|configuration/.*)
EDITORCONFIG_FILE_NAME: .editorconfig-checker.json EDITORCONFIG_FILE_NAME: .editorconfig-checker.json
DOCKERFILE_HADOLINT_FILE_NAME: .hadolint.yaml DOCKERFILE_HADOLINT_FILE_NAME: .hadolint.yaml

1
Dockerfile
View File

@ -79,7 +79,6 @@ COPY ${NETBOX_PATH} /opt/netbox
COPY docker/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py 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/ldap_config.docker.py /opt/netbox/netbox/netbox/ldap_config.py
COPY docker/docker-entrypoint.sh /opt/netbox/docker-entrypoint.sh 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 docker/launch-netbox.sh /opt/netbox/launch-netbox.sh
COPY configuration/ /etc/netbox/config/ COPY configuration/ /etc/netbox/config/
COPY docker/nginx-unit.json /etc/unit/ COPY docker/nginx-unit.json /etc/unit/

2
VERSION
View File

@ -1 +1 @@
3.3.0 3.4.0

9
docker-compose.test.yml
View File

@ -28,15 +28,6 @@ services:
start_period: 40s start_period: 40s
timeout: 3s timeout: 3s
interval: 15s 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: postgres:
image: docker.io/postgres:17-alpine image: docker.io/postgres:17-alpine

14
docker-compose.yml
View File

@ -1,6 +1,6 @@
services: services:
netbox: &netbox 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: depends_on:
- postgres - postgres
- redis - redis
@ -31,18 +31,6 @@ services:
start_period: 20s start_period: 20s
timeout: 3s timeout: 3s
interval: 15s 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
postgres: postgres:

8
docker/housekeeping.sh
View File

@ -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

1
env/netbox.env vendored
View File

@ -15,7 +15,6 @@ EMAIL_USERNAME=netbox
EMAIL_USE_SSL=false EMAIL_USE_SSL=false
EMAIL_USE_TLS=false EMAIL_USE_TLS=false
GRAPHQL_ENABLED=true GRAPHQL_ENABLED=true
HOUSEKEEPING_INTERVAL=86400
MEDIA_ROOT=/opt/netbox/netbox/media MEDIA_ROOT=/opt/netbox/netbox/media
METRICS_ENABLED=false METRICS_ENABLED=false
REDIS_CACHE_DATABASE=1 REDIS_CACHE_DATABASE=1

2
requirements-container.txt
View File

@ -3,4 +3,4 @@ dulwich==0.24.1
python3-saml==1.16.0 python3-saml==1.16.0
--no-binary lxml --no-binary lxml
--no-binary xmlsec --no-binary xmlsec
sentry-sdk[django]==2.35.0 sentry-sdk[django]==2.35.2