From 0e02606ce5c1ea7c981e595d8c76f238f393537f Mon Sep 17 00:00:00 2001 From: Etienne Pallier Date: Fri, 1 Oct 2021 16:11:31 +0200 Subject: [PATCH] Changed version number format - and added blank line at end of each PYROS_DOCKER script --- .gitignore | 3 +++ docker/PYROS_DOCKER_BUILD.bat | 3 ++- docker/PYROS_DOCKER_INSTALL | 1 + docker/PYROS_DOCKER_INSTALL.bat | 3 ++- docker/PYROS_DOCKER_RUN | 3 ++- docker/PYROS_DOCKER_RUN.bat | 3 ++- docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY.bat | 3 ++- docker/PYROS_DOCKER_SHELL | 3 ++- docker/PYROS_DOCKER_SHELL.bat | 3 ++- docker/PYROS_DOCKER_START.bat | 3 ++- docker/PYROS_DOCKER_STOP.bat | 3 ++- docker/PYROS_DOCKER_TEST.bat | 3 ++- docker/PYROS_DOCKER_UPDATE.bat | 3 ++- src/core/pyros_django/misc/templates/base.html | 9 ++++++--- src/core/pyros_django/misc/templates/base_unlogged.html | 7 +++++-- 15 files changed, 37 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index dabd712..8d5be37 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,9 @@ __pycache__ *.pyc *.py.bak +BASE_TEMPLATE_UNLOGGED.HTML +BASE_TEMPLATE.HTML + # Ignore all PNG files except from src/doc/ and src/core/pyros_django/misc/static/media/ *.png !src/doc/*.png diff --git a/docker/PYROS_DOCKER_BUILD.bat b/docker/PYROS_DOCKER_BUILD.bat index 95acceb..846d6d7 100755 --- a/docker/PYROS_DOCKER_BUILD.bat +++ b/docker/PYROS_DOCKER_BUILD.bat @@ -1 +1,2 @@ -docker-compose build \ No newline at end of file +docker-compose build + diff --git a/docker/PYROS_DOCKER_INSTALL b/docker/PYROS_DOCKER_INSTALL index fc104f6..4ca44ce 100755 --- a/docker/PYROS_DOCKER_INSTALL +++ b/docker/PYROS_DOCKER_INSTALL @@ -17,3 +17,4 @@ do done # db container is ready to execture queries, we can start the installation docker exec -it pyros python3 pyros.py install + diff --git a/docker/PYROS_DOCKER_INSTALL.bat b/docker/PYROS_DOCKER_INSTALL.bat index 29270e7..7b3f261 100755 --- a/docker/PYROS_DOCKER_INSTALL.bat +++ b/docker/PYROS_DOCKER_INSTALL.bat @@ -1 +1,2 @@ -docker exec -it pyros python3 pyros.py install \ No newline at end of file +docker exec -it pyros python3 pyros.py install + diff --git a/docker/PYROS_DOCKER_RUN b/docker/PYROS_DOCKER_RUN index cd6799e..6a21876 100755 --- a/docker/PYROS_DOCKER_RUN +++ b/docker/PYROS_DOCKER_RUN @@ -11,7 +11,8 @@ fi # - Display log on current terminal #docker exec -it pyros python3 pyros.py start webserver $@ # - Save log in file -docker exec pyros python3 pyros.py start webserver $@ > ../../LOG_PYROS_webserver.log 2>&1 & +#docker exec pyros python3 pyros.py start webserver $@ > ../../LOG_PYROS_webserver.log 2>&1 & +docker exec pyros python3 pyros.py start webserver > ../../LOG_PYROS_webserver.log 2>&1 & # 2) PLC simulator # - Display log on current terminal diff --git a/docker/PYROS_DOCKER_RUN.bat b/docker/PYROS_DOCKER_RUN.bat index a3304e5..f7c5c8c 100755 --- a/docker/PYROS_DOCKER_RUN.bat +++ b/docker/PYROS_DOCKER_RUN.bat @@ -1 +1,2 @@ -docker exec -it pyros python3 pyros.py start webserver \ No newline at end of file +docker exec -it pyros python3 pyros.py start webserver + diff --git a/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY.bat b/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY.bat index a3304e5..f7c5c8c 100755 --- a/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY.bat +++ b/docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY.bat @@ -1 +1,2 @@ -docker exec -it pyros python3 pyros.py start webserver \ No newline at end of file +docker exec -it pyros python3 pyros.py start webserver + diff --git a/docker/PYROS_DOCKER_SHELL b/docker/PYROS_DOCKER_SHELL index 25c8487..c5b89df 100755 --- a/docker/PYROS_DOCKER_SHELL +++ b/docker/PYROS_DOCKER_SHELL @@ -6,4 +6,5 @@ then echo "db_pyros or pyros weren't running, starting them..." ./PYROS_DOCKER_START.bat fi -docker exec -it pyros bash \ No newline at end of file +docker exec -it pyros bash + diff --git a/docker/PYROS_DOCKER_SHELL.bat b/docker/PYROS_DOCKER_SHELL.bat index 32dfdf8..dcc4ff5 100755 --- a/docker/PYROS_DOCKER_SHELL.bat +++ b/docker/PYROS_DOCKER_SHELL.bat @@ -1 +1,2 @@ -docker exec -it pyros bash \ No newline at end of file +docker exec -it pyros bash + diff --git a/docker/PYROS_DOCKER_START.bat b/docker/PYROS_DOCKER_START.bat index 5177d11..7ec07d7 100755 --- a/docker/PYROS_DOCKER_START.bat +++ b/docker/PYROS_DOCKER_START.bat @@ -1 +1,2 @@ -docker-compose up -d \ No newline at end of file +docker-compose up -d + diff --git a/docker/PYROS_DOCKER_STOP.bat b/docker/PYROS_DOCKER_STOP.bat index 58694d0..76b3eaf 100755 --- a/docker/PYROS_DOCKER_STOP.bat +++ b/docker/PYROS_DOCKER_STOP.bat @@ -1 +1,2 @@ -docker-compose down \ No newline at end of file +docker-compose down + diff --git a/docker/PYROS_DOCKER_TEST.bat b/docker/PYROS_DOCKER_TEST.bat index 4191774..171682d 100755 --- a/docker/PYROS_DOCKER_TEST.bat +++ b/docker/PYROS_DOCKER_TEST.bat @@ -1 +1,2 @@ -docker exec -it pyros python3 pyros.py test \ No newline at end of file +docker exec -it pyros python3 pyros.py test + diff --git a/docker/PYROS_DOCKER_UPDATE.bat b/docker/PYROS_DOCKER_UPDATE.bat index 6b9a889..906591e 100755 --- a/docker/PYROS_DOCKER_UPDATE.bat +++ b/docker/PYROS_DOCKER_UPDATE.bat @@ -1 +1,2 @@ -docker exec -it pyros python3 pyros.py update \ No newline at end of file +docker exec -it pyros python3 pyros.py update + diff --git a/src/core/pyros_django/misc/templates/base.html b/src/core/pyros_django/misc/templates/base.html index b63c437..f494768 100644 --- a/src/core/pyros_django/misc/templates/base.html +++ b/src/core/pyros_django/misc/templates/base.html @@ -10,7 +10,7 @@ - {{ request.session.obsname}} Control Center - VERSION 2021.0.1 + {{ request.session.obsname}} Control Center - VERSION 2021.0.2.0 @@ -465,6 +465,9 @@ footer{ - \ No newline at end of file + diff --git a/src/core/pyros_django/misc/templates/base_unlogged.html b/src/core/pyros_django/misc/templates/base_unlogged.html index 941be4c..84ba3a3 100644 --- a/src/core/pyros_django/misc/templates/base_unlogged.html +++ b/src/core/pyros_django/misc/templates/base_unlogged.html @@ -9,7 +9,7 @@ - {{ request.session.obsname}} Control Center - VERSION 2021.0.1 + {{ request.session.obsname}} Control Center - VERSION 2021.0.2.0 @@ -387,6 +387,9 @@ footer{ -- libgit2 0.21.2