diff --git a/Dockerfile b/Dockerfile index e22c55d..452b44c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -79,7 +79,6 @@ COPY ${NETBOX_PATH} /opt/netbox 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/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 configuration/ /etc/netbox/config/ COPY docker/nginx-unit.json /etc/unit/ diff --git a/docker-compose.test.yml b/docker-compose.test.yml index bbc139c..9388022 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -28,15 +28,6 @@ services: start_period: 40s timeout: 3s 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: image: docker.io/postgres:17-alpine diff --git a/docker-compose.yml b/docker-compose.yml index 3ba2fd4..8ac3358 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,18 +31,6 @@ services: start_period: 20s timeout: 3s 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: diff --git a/docker/housekeeping.sh b/docker/housekeeping.sh deleted file mode 100755 index 47a4a3d..0000000 --- a/docker/housekeeping.sh +++ /dev/null @@ -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 diff --git a/env/netbox.env b/env/netbox.env index ca22549..c89844f 100644 --- a/env/netbox.env +++ b/env/netbox.env @@ -15,7 +15,6 @@ EMAIL_USERNAME=netbox EMAIL_USE_SSL=false EMAIL_USE_TLS=false GRAPHQL_ENABLED=true -HOUSEKEEPING_INTERVAL=86400 MEDIA_ROOT=/opt/netbox/netbox/media METRICS_ENABLED=false REDIS_CACHE_DATABASE=1