Changed entrypoint to "tini".

netbox-community · Sep 13, 2021 · 3309627 · 3309627
1 parent 2926d1a
commit 3309627
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git 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.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