Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ COPY configuration/plugins.py /etc/netbox/config/plugins.py
COPY configuration/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY entrypoint.sh /opt/netbox/entrypoint.sh

LABEL internal_version="4.4.5.2"
LABEL internal_version="4.4.5.3"

CMD ["/opt/netbox/entrypoint.sh"]
1 change: 1 addition & 0 deletions configuration/plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
"netbox_cloudflare_plugin",
"netbox_docker_plugin",
"netbox_passhup_plugin",
"netbox_prometheus_sd",
]
20 changes: 7 additions & 13 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ services:
netbox:
image: ${IMAGE}:${TAG}
ports:
- 8080:8080
- 8080:8080
depends_on:
postgres:
condition: service_healthy
valkey:
redis:
condition: service_started
valkey-cache:
condition: service_started
user: 'unit:root'
user: "unit:root"
healthcheck:
interval: 60s
start_period: 60s
Expand All @@ -23,7 +21,7 @@ services:
- netbox-reports-files:/opt/netbox/netbox/reports
- netbox-scripts-files:/opt/netbox/netbox/scripts
postgres:
image: docker.io/postgres:15-alpine
image: postgres:18
env_file: env/postgres.env
healthcheck:
interval: 60s
Expand All @@ -32,15 +30,11 @@ services:
retries: 5
test: "pg_isready -U $$POSTGRES_USER"
volumes:
- netbox-postgres-data:/var/lib/postgresql/data
valkey:
image: valkey/valkey:7-alpine
- netbox-postgres-data:/var/lib/postgresql
redis:
image: redis:8
volumes:
- netbox-valkey-data:/data
valkey-cache:
image: valkey/valkey:7-alpine
volumes:
- netbox-valkey-cache-data:/data
volumes:
netbox-media-files:
driver: local
Expand Down
4 changes: 2 additions & 2 deletions env/netbox.env
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ HOUSEKEEPING_INTERVAL=86400
MEDIA_ROOT=/opt/netbox/netbox/media
METRICS_ENABLED=false
REDIS_CACHE_DATABASE=1
REDIS_CACHE_HOST=valkey-cache
REDIS_CACHE_HOST=redis
REDIS_CACHE_INSECURE_SKIP_TLS_VERIFY=false
REDIS_CACHE_SSL=false
REDIS_DATABASE=0
REDIS_HOST=valkey
REDIS_HOST=redis
REDIS_INSECURE_SKIP_TLS_VERIFY=false
REDIS_SSL=false
RELEASE_CHECK_URL=https://api.github.com/repos/netbox-community/netbox/releases
Expand Down
1 change: 1 addition & 0 deletions plugin_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
netbox-cloudflare-plugin == 0.*
netbox-docker-plugin == 4.10.*
netbox-passhup-plugin == 0.*
netbox-plugin-prometheus-sd == 1.2.0
supervisor == 4.*