netbox v4+

2026-04-23 10:21:55 +02:00
parent 956c5b3875
commit e9fb2c3ed3
3 changed files with 20 additions and 81 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,11 +4,11 @@ services:
    image: netboxcommunity/netbox:${NETBOX_VERSION}-${NETBOX_DOCKER_VERSION}
    restart: unless-stopped
    depends_on:
-      - netbox-worker
      - postgres
      - redis
      - redis-cache
    environment:
+      - API_TOKEN_PEPPER_1=${NETBOX_API_TOKEN_PEPPER_1}
      - CORS_ORIGIN_ALLOW_ALL=True
      - DB_HOST=postgres
      - DB_NAME=${PSQL_NAME}
@@ -24,14 +24,11 @@ services:
      - EMAIL_FROM=${NETBOX_EMAIL_FROM}
      - EMAIL_USERNAME=${NETBOX_EMAIL_USER}
      - EMAIL_PASSWORD=${NETBOX_EMAIL_PASS}
+      - GRANIAN_BACKPRESSURE=${NETBOX_GRANIAN_BACKPRESSURE}
+      - GRANIAN_WORKERS=${NETBOX_GRANIAN_WORKERS}
      - GRAPHQL_ENABLED=${NETBOX_GRAPHQL}
-      - HOUSEKEEPING_INTERVAL=86400
-      - MAX_PAGE_SIZE=1000
      - MEDIA_ROOT=/opt/netbox/netbox/media
      - METRICS_ENABLED=${NETBOX_METRICS}
-      - NAPALM_USERNAME=${NETBOX_NAPALM_USER}
-      - NAPALM_PASSWORD=${NETBOX_NAPALM_PASS}
-      - NAPALM_TIMEOUT=10
      - REDIS_HOST=redis
      - REDIS_DATABASE=0
      - REDIS_PASSWORD=${REDIS_PASS}
@@ -44,12 +41,7 @@ services:
      - REDIS_CACHE_INSECURE_SKIP_TLS_VERIFY=false
      - RELEASE_CHECK_URL=https://api.github.com/repos/netbox-community/netbox/releases
      - SECRET_KEY=${NETBOX_SECRET_KEY}
-      - SKIP_STARTUP_SCRIPTS=${NETBOX_SKIP_SCRIPTS}
      - SKIP_SUPERUSER=${NETBOX_SKIP_SUPERUSER}
-      - SUPERUSER_API_TOKEN=${NETBOX_SUPERUSER_TOKEN}
-      - SUPERUSER_EMAIL=${NETBOX_SUPERUSER_EMAIL}
-      - SUPERUSER_NAME=${NETBOX_SUPERUSER_NAME}
-      - SUPERUSER_PASSWORD=${NETBOX_SUPERUSER_PASS}
      - WEBHOOKS_ENABLED=${NETBOX_WEBHOOKS}
    healthcheck:
      test: curl -f http://localhost:8080/login/ || exit 1
@@ -74,23 +66,15 @@ services:
      - traefik.http.routers.https-${TRAEFIK_ROUTER}.tls.certresolver=${TRAEFIK_CERTRESOLVER}
      # specify a service so a custom port can be used
      - traefik.http.services.${TRAEFIK_SERVICE}.loadbalancer.server.port=${TRAEFIK_SERVICE_PORT}
-      ### Section DIUN
-      - diun.enable=${DIUN_NETBOX_ENABLE}
-      - diun.watch_repo=${DIUN_NETBOX_WATCHREPO}
-      - diun.sort_tags=${DIUN_NETBOX_SORTALGO}
-      - diun.include_tags=${DIUN_NETBOX_INCLUDE}
-      - diun.exclude_tags=${DIUN_NETBOX_EXCLUDE}
    networks:
      - internal
      - traefik
-    user: unit:root
+    user: netbox:root
    volumes:
      - ${NETBOX_DATA}/configuration:/etc/netbox/config:z,ro
-      - ${NETBOX_DATA}/initializers:/opt/netbox/initializers:z,ro
      - ${NETBOX_DATA}/media:/opt/netbox/netbox/media:z
      - ${NETBOX_DATA}/reports:/etc/netbox/reports:z,ro
      - ${NETBOX_DATA}/scripts:/etc/netbox/scripts:z,ro
-      - ${NETBOX_DATA}/startup_scripts:/opt/netbox/startup_scripts:z,ro

  netbox-worker:
    <<: *netbox
@@ -99,8 +83,8 @@ services:
      - /opt/netbox/netbox/manage.py
      - rqworker
    depends_on:
-      - postgres
-      - redis
+      netbox:
+        condition: service_healthy
    healthcheck:
      test: ps -aux | grep -v grep | grep -q rqworker || exit 1
      start_period: 20s
@@ -111,18 +95,6 @@ services:
    networks:
      - internal

-  netbox-housekeeping:
-    <<: *netbox
-    command:
-      - /opt/netbox/housekeeping.sh
-    depends_on:
-      - postgres
-      - redis
-    labels:
-      - traefik.enable=false
-    networks:
-      - internal
-
  postgres:
    image: postgres:${PSQL_VERSION}
    restart: unless-stopped
@@ -136,13 +108,6 @@ services:
      timeout: 30s
      interval: 10s
      retries: 5
-    labels:
-      ### Section DIUN
-      - diun.enable=${DIUN_POSTGRES_ENABLE}
-      - diun.watch_repo=${DIUN_POSTGRES_WATCHREPO}
-      - diun.sort_tags=${DIUN_POSTGRES_SORTALGO}
-      - diun.include_tags=${DIUN_POSTGRES_INCLUDE}
-      - diun.exclude_tags=${DIUN_POSTGRES_EXCLUDE}
    networks:
      - internal
    volumes:
@@ -163,13 +128,6 @@ services:
      timeout: 3s
      interval: 1s
      retries: 5
-    labels:
-      ### Section DIUN
-      - diun.enable=${DIUN_REDIS_ENABLE}
-      - diun.watch_repo=${DIUN_REDIS_WATCHREPO}
-      - diun.sort_tags=${DIUN_REDIS_SORTALGO}
-      - diun.include_tags=${DIUN_REDIS_INCLUDE}
-      - diun.exclude_tags=${DIUN_REDIS_EXCLUDE}
    networks:
      - internal
    volumes:
--- a/env.example
+++ b/env.example
@@ -1,7 +1,8 @@
 # NetBox
-NETBOX_DOCKER_VERSION=2.1.0
-NETBOX_VERSION=v3.2.9
+NETBOX_DOCKER_VERSION=4.0.2
+NETBOX_VERSION=v4.5.8
 NETBOX_DATA=./data/netbox
+NETBOX_API_TOKEN_PEPPER_1="Qy+F=OTeGskWQ(wTMgjc+NPPlz6YwFXY=KHIIg=wpYXT&e(6u8"
 NETBOX_EMAIL_SERVER=localhost
 NETBOX_EMAIL_PORT=25
 NETBOX_EMAIL_SSLCER=
@@ -12,17 +13,12 @@ NETBOX_EMAIL_TLS=false
 NETBOX_EMAIL_FROM=netbox@bar.com
 NETBOX_EMAIL_USER=netbox
 NETBOX_EMAIL_PASS=
+NETBOX_GRANIAN_BACKPRESSURE=4
+NETBOX_GRANIAN_WORKERS=4
 NETBOX_GRAPHQL=true
 NETBOX_METRICS=false
-NETBOX_NAPALM_USER=
-NETBOX_NAPALM_PASS=
-NETBOX_SECRET_KEY=r8OwDznj!!dci#P9ghmRfdu1Ysxm0AiPeDCQhKE+N_rClfWNj
-NETBOX_SKIP_SCRIPTS=false
+NETBOX_SECRET_KEY="NTrLgQElN=8fIGX6PedJgUgc79R5gZEG3#Jyu2X)=2bx0KkRsl"
 NETBOX_SKIP_SUPERUSER=false
-NETBOX_SUPERUSER_TOKEN=0123456789abcdef0123456789abcdef01234567
-NETBOX_SUPERUSER_EMAIL=admin@example.com
-NETBOX_SUPERUSER_NAME=admin
-NETBOX_SUPERUSER_PASS=admin
 NETBOX_WEBHOOKS=true

 # Træfik
@@ -35,32 +31,15 @@ TRAEFIK_CERTRESOLVER=letsencrypt
 TRAEFIK_SERVICE=netbox_example_com
 TRAEFIK_SERVICE_PORT=8080

-# DIUN
-DIUN_NETBOX_ENABLE=true
-DIUN_NETBOX_WATCHREPO=true
-DIUN_NETBOX_SORTALGO=semver
-DIUN_NETBOX_INCLUDE=v[0-9]\.[0-9]\.[0-9]-[0-9]\.[0-9]\.[0-9]
-DIUN_NETBOX_EXCLUDE=
-DIUN_POSTGRES_ENABLE=true
-DIUN_POSTGRES_WATCHREPO=true
-DIUN_POSTGRES_SORTALGO=semver
-DIUN_POSTGRES_INCLUDE=v[0-9]\.[0-9]\.[0-9]-[0-9]\.[0-9]\.[0-9]
-DIUN_POSTGRES_EXCLUDE=
-DIUN_REDIS_ENABLE=true
-DIUN_REDIS_WATCHREPO=true
-DIUN_REDIS_SORTALGO=semver
-DIUN_REDIS_INCLUDE=v[0-9]\.[0-9]\.[0-9]-[0-9]\.[0-9]\.[0-9]
-DIUN_REDIS_EXCLUDE=
-
 # PostgreSQL
-PSQL_VERSION=14.5-alpine3.16
+PSQL_VERSION=18.3-alpine3.22
 PSQL_DATA=./data/postgres
 PSQL_NAME=netbox
 PSQL_USER=netbox
 PSQL_PASS=J5brHrAXFLQSif0K

 # Redis
-REDIS_VERSION=7.0.4-alpine3.16
+REDIS_VERSION=8.6.2-alpine3.23
 REDIS_DATA=./data/redis
 REDIS_PASS=H733Kdjndks81

--- a/update_base.sh
+++ b/update_base.sh
@@ -1,12 +1,14 @@
 #/usr/bin/env bash
 set -e

+DIRS=(configuration)
+
 source .env
-rm -rf ${NETBOX_DATA}/{configuration,initializers,reports,scripts,startup_scripts}
-mkdir -p ${NETBOX_DATA}
+rm -rf "${DIRS[@]/#/${NETBOX_DATA}/}"
+mkdir -p "${NETBOX_DATA}"
 git clone https://github.com/netbox-community/netbox-docker.git
 cd netbox-docker
-git checkout ${NETBOX_DOCKER_VERSION}
+git checkout "${NETBOX_DOCKER_VERSION}"
 cd ..
-mv netbox-docker/{configuration,initializers,reports,scripts,startup_scripts} ${NETBOX_DATA}
+mv "${DIRS[@]/#/netbox-docker/}" "${NETBOX_DATA}"
 rm -rf netbox-docker