From 16b7d6c34df29499653706b4ccea1f730fba0432 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 16 May 2021 18:18:58 +0200 Subject: [PATCH 1/4] database and debug info in version copy --- InvenTree/templates/version.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/InvenTree/templates/version.html b/InvenTree/templates/version.html index c8ec6862b6..3349bb5fb2 100644 --- a/InvenTree/templates/version.html +++ b/InvenTree/templates/version.html @@ -2,4 +2,6 @@ InvenTree-Version: {% inventree_version %} Django Version: {% django_version %} {% inventree_commit_hash as hash %}{% if hash %}Commit Hash: {{ hash }}{% endif %} -{% inventree_commit_date as commit_date %}{% if commit_date %}Commit Date: {{ commit_date }}{% endif %} \ No newline at end of file +{% inventree_commit_date as commit_date %}{% if commit_date %}Commit Date: {{ commit_date }}{% endif %} +Database: {% inventree_db_engine %} +Debug-Mode: {% inventree_in_debug_mode %} From b2a912c77020786048f5b0ed11acb0eca8f4cc03 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 16 May 2021 18:19:35 +0200 Subject: [PATCH 2/4] docker-mode switch in settings and tags --- InvenTree/InvenTree/settings.py | 5 +++++ InvenTree/part/templatetags/inventree_extras.py | 7 +++++++ docker/Dockerfile | 1 + 3 files changed, 13 insertions(+) diff --git a/InvenTree/InvenTree/settings.py b/InvenTree/InvenTree/settings.py index 7ff90fc7c3..67a500a07a 100644 --- a/InvenTree/InvenTree/settings.py +++ b/InvenTree/InvenTree/settings.py @@ -87,6 +87,11 @@ DEBUG = _is_true(get_setting( CONFIG.get('debug', True) )) +DOCKER = _is_true(get_setting( + 'INVENTREE_DOCKER', + False +)) + # Configure logging settings log_level = get_setting( 'INVENTREE_LOG_LEVEL', diff --git a/InvenTree/part/templatetags/inventree_extras.py b/InvenTree/part/templatetags/inventree_extras.py index e8743028a0..734b365447 100644 --- a/InvenTree/part/templatetags/inventree_extras.py +++ b/InvenTree/part/templatetags/inventree_extras.py @@ -81,6 +81,13 @@ def inventree_in_debug_mode(*args, **kwargs): return djangosettings.DEBUG +@register.simple_tag() +def inventree_docker_mode(*args, **kwargs): + """ Return True if the server is running as a Docker image """ + + return djangosettings.DOCKER + + @register.simple_tag() def inventree_db_engine(*args, **kwargs): """ Return the InvenTree database backend e.g. 'postgresql' """ diff --git a/docker/Dockerfile b/docker/Dockerfile index 3e0a7e1230..ea70d9f994 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,6 +14,7 @@ ENV INVENTREE_REPO="${repository}" ENV INVENTREE_BRANCH="${branch}" ENV INVENTREE_LOG_LEVEL="INFO" +ENV INVENTREE_DOCKER="true" # InvenTree paths ENV INVENTREE_SRC_DIR="${INVENTREE_HOME}/src" From ff9970f1cc42a823be665a6e9d1baa7437fcc22a Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 16 May 2021 18:20:06 +0200 Subject: [PATCH 3/4] docker in version copy --- InvenTree/templates/version.html | 1 + 1 file changed, 1 insertion(+) diff --git a/InvenTree/templates/version.html b/InvenTree/templates/version.html index 3349bb5fb2..b702fd85f5 100644 --- a/InvenTree/templates/version.html +++ b/InvenTree/templates/version.html @@ -5,3 +5,4 @@ Django Version: {% django_version %} {% inventree_commit_date as commit_date %}{% if commit_date %}Commit Date: {{ commit_date }}{% endif %} Database: {% inventree_db_engine %} Debug-Mode: {% inventree_in_debug_mode %} +Deployed using Docker: {% inventree_docker_mode %} \ No newline at end of file From cfa6994302ec85494cdbf8b90313ccd9ecbb5b0c Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 16 May 2021 18:20:32 +0200 Subject: [PATCH 4/4] docker-mode in stats --- InvenTree/templates/stats.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/InvenTree/templates/stats.html b/InvenTree/templates/stats.html index 1598d45d26..403030644a 100644 --- a/InvenTree/templates/stats.html +++ b/InvenTree/templates/stats.html @@ -26,6 +26,14 @@ {% trans "Server is running in debug mode" %} {% endif %} + {% inventree_docker_mode as docker_mode %} + {% if docker_mode %} + + + {% trans "Docker Mode" %} + {% trans "Server is deployed using docker" %} + + {% endif %} {% if user.is_staff %}