Merge c8d766a95b into b97c177df8

Merge pull request #1501 from tobiasge/remove-housekeeping-container
Housekeeping
2025-12-11 06:12:37 +00:00 · 2025-08-19 10:37:58 +08:00 · 2025-08-18 10:49:53 +02:00 · 2025-08-18 08:45:47 +02:00 · 2025-07-08 07:45:38 +02:00
6 changed files with 3 additions and 37 deletions
--- a/1
+++ b/1
@ -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/
--- a/README.md
+++ b/README.md
@ -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
 ```
--- 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
--- 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:
--- a/docker/housekeeping.sh
+++ b/docker/housekeeping.sh
@ -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
--- 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
Author	SHA1	Message	Date
Tobias Genannt	27d6f60428	Merge `c8d766a95b` into `b97c177df8`	2025-08-19 10:37:58 +08:00
Tobias Genannt	b97c177df8	Merge pull request #1501 from tobiasge/remove-housekeeping-container Some checks failed push / Checks syntax of our code (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04-arm) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04-arm) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04-arm) (push) Has been cancelled Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04-arm) (push) Has been cancelled Details Housekeeping	2025-08-18 10:49:53 +02:00
Tobias Genannt	67eff20f7d	Housekeeping	2025-08-18 08:45:47 +02:00
Tobias Genannt	c8d766a95b	Use our example file in the Readme	2025-07-08 07:45:38 +02:00