Changed entrypoint to "tini".

This commit is contained in:
Tobias Genannt 2021-09-13 08:18:23 +02:00
parent 2926d1a11d
commit a8b6883183
4 changed files with 4 additions and 12 deletions

View File

@ -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/ \ --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 && 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="" \ LABEL ORIGINAL_TAG="" \
NETBOX_GIT_BRANCH="" \ NETBOX_GIT_BRANCH="" \

View File

@ -17,8 +17,6 @@ services:
- ./reports:/etc/netbox/reports:z,ro - ./reports:/etc/netbox/reports:z,ro
- ./scripts:/etc/netbox/scripts:z,ro - ./scripts:/etc/netbox/scripts:z,ro
- netbox-media-files:/opt/netbox/netbox/media:z - netbox-media-files:/opt/netbox/netbox/media:z
ports:
- 8080
postgres: postgres:
image: postgres:13-alpine image: postgres:13-alpine
env_file: env/postgres.env env_file: env/postgres.env

View File

@ -21,9 +21,6 @@ services:
depends_on: depends_on:
- redis - redis
- postgres - postgres
entrypoint:
- "/sbin/tini"
- "--"
command: command:
- /opt/netbox/venv/bin/python - /opt/netbox/venv/bin/python
- /opt/netbox/netbox/manage.py - /opt/netbox/netbox/manage.py
@ -33,9 +30,6 @@ services:
depends_on: depends_on:
- redis - redis
- postgres - postgres
entrypoint:
- "/sbin/tini"
- "--"
command: command:
- /opt/netbox/housekeeping.sh - /opt/netbox/housekeeping.sh

View File

@ -56,13 +56,13 @@ test_setup() {
test_netbox_unit_tests() { test_netbox_unit_tests() {
echo "⏱ Running 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() { test_initializers() {
echo "🏭 Testing Initializers" echo "🏭 Testing Initializers"
export INITIALIZERS_DIR export INITIALIZERS_DIR
$doco run --rm netbox ./manage.py check $doco run --rm netbox /opt/netbox/docker-entrypoint.sh ./manage.py check
} }
test_cleanup() { test_cleanup() {