From 58debafa8ae5a0c767b5f883088d625fe21e7c1e Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Fri, 3 Sep 2021 12:48:30 +0200 Subject: [PATCH 1/3] Added container for Netbox housekeeping command Adds an additional container in which the new "housekeeping" command from Netbox v3.0.0 is run. --- Dockerfile | 6 ++++-- docker-compose.yml | 15 ++++++++++++++- docker/housekeeping.sh | 8 ++++++++ env/netbox.env | 1 + 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100755 docker/housekeeping.sh diff --git a/Dockerfile b/Dockerfile index 005d919..d87c7d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,11 +62,12 @@ RUN apk add --no-cache \ libevent \ libffi \ libjpeg-turbo \ - openssl \ libxslt \ + openssl \ postgresql-libs \ - python3 \ py3-pip \ + python3 \ + tini \ unit \ unit-python3 @@ -82,6 +83,7 @@ COPY ${NETBOX_PATH} /opt/netbox COPY docker/configuration.docker.py /opt/netbox/netbox/netbox/configuration.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 startup_scripts/ /opt/netbox/startup_scripts/ COPY initializers/ /opt/netbox/initializers/ diff --git a/docker-compose.yml b/docker-compose.yml index 09d52a7..f38665b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,11 +20,24 @@ services: <<: *netbox depends_on: - redis + - postgres entrypoint: + - "/sbin/tini" + - "--" + command: - /opt/netbox/venv/bin/python - /opt/netbox/netbox/manage.py - command: - rqworker + netbox-housekeeping: + <<: *netbox + depends_on: + - redis + - postgres + entrypoint: + - "/sbin/tini" + - "--" + command: + - /opt/netbox/housekeeping.sh # postgres postgres: diff --git a/docker/housekeeping.sh b/docker/housekeeping.sh new file mode 100755 index 0000000..a098087 --- /dev/null +++ b/docker/housekeeping.sh @@ -0,0 +1,8 @@ +#!/bin/bash +SECONDS=${HOUSEKEEPING_INTERVAL:=86400} +echo "Interval set to ${SECONDS} seconds" +while true; do + date + /opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py housekeeping + sleep ${SECONDS}s +done diff --git a/env/netbox.env b/env/netbox.env index 1f6f896..1300873 100644 --- a/env/netbox.env +++ b/env/netbox.env @@ -14,6 +14,7 @@ EMAIL_USERNAME=netbox # EMAIL_USE_SSL and EMAIL_USE_TLS are mutually exclusive, i.e. they can't both be `true`! EMAIL_USE_SSL=false EMAIL_USE_TLS=false +HOUSEKEEPING_INTERVAL=86400 MAX_PAGE_SIZE=1000 MEDIA_ROOT=/opt/netbox/netbox/media METRICS_ENABLED=false From 2926d1a11d3e9826866072602c13766498c4cd7e Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Tue, 7 Sep 2021 09:47:38 +0200 Subject: [PATCH 2/3] Quote variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Christian Mäder --- docker/housekeeping.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/housekeeping.sh b/docker/housekeeping.sh index a098087..cfe06b1 100755 --- a/docker/housekeeping.sh +++ b/docker/housekeeping.sh @@ -4,5 +4,5 @@ echo "Interval set to ${SECONDS} seconds" while true; do date /opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py housekeeping - sleep ${SECONDS}s + sleep "${SECONDS}s" done From a8b6883183078ec927655be53ba36b02a31a9274 Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Mon, 13 Sep 2021 08:18:23 +0200 Subject: [PATCH 3/3] Changed entrypoint to "tini". --- Dockerfile | 4 ++-- docker-compose.test.yml | 2 -- docker-compose.yml | 6 ------ test.sh | 4 ++-- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index d87c7d2..27597e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -100,9 +100,9 @@ RUN mkdir -p static /opt/unit/state/ /opt/unit/tmp/ \ --config-file /opt/netbox/mkdocs.yml --site-dir /opt/netbox/netbox/project-static/docs/ \ && SECRET_KEY="dummy" /opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py collectstatic --no-input -ENTRYPOINT [ "/opt/netbox/docker-entrypoint.sh" ] +ENTRYPOINT [ "/sbin/tini", "--" ] -CMD [ "/opt/netbox/launch-netbox.sh" ] +CMD [ "/opt/netbox/docker-entrypoint.sh", "/opt/netbox/launch-netbox.sh" ] LABEL ORIGINAL_TAG="" \ NETBOX_GIT_BRANCH="" \ diff --git a/docker-compose.test.yml b/docker-compose.test.yml index df681d2..1ca0903 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -17,8 +17,6 @@ services: - ./reports:/etc/netbox/reports:z,ro - ./scripts:/etc/netbox/scripts:z,ro - netbox-media-files:/opt/netbox/netbox/media:z - ports: - - 8080 postgres: image: postgres:13-alpine env_file: env/postgres.env diff --git a/docker-compose.yml b/docker-compose.yml index f38665b..2dbd7df 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,9 +21,6 @@ services: depends_on: - redis - postgres - entrypoint: - - "/sbin/tini" - - "--" command: - /opt/netbox/venv/bin/python - /opt/netbox/netbox/manage.py @@ -33,9 +30,6 @@ services: depends_on: - redis - postgres - entrypoint: - - "/sbin/tini" - - "--" command: - /opt/netbox/housekeeping.sh diff --git a/test.sh b/test.sh index f472477..d2091e4 100755 --- a/test.sh +++ b/test.sh @@ -56,13 +56,13 @@ test_setup() { test_netbox_unit_tests() { echo "⏱ Running NetBox Unit Tests" - SKIP_STARTUP_SCRIPTS=true $doco run --rm netbox ./manage.py test + $doco run --rm netbox /opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py test } test_initializers() { echo "🏭 Testing Initializers" export INITIALIZERS_DIR - $doco run --rm netbox ./manage.py check + $doco run --rm netbox /opt/netbox/docker-entrypoint.sh ./manage.py check } test_cleanup() {