Changed version number format - and added blank line at end of each PYROS_DOCKER script

Etienne Pallier
1 parent 025cf279
Showing 15 changed files with 37 additions and 16 deletions Show diff stats
.gitignore
docker/PYROS_DOCKER_BUILD.bat
docker/PYROS_DOCKER_INSTALL
docker/PYROS_DOCKER_INSTALL.bat
docker/PYROS_DOCKER_RUN
docker/PYROS_DOCKER_RUN.bat
docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY.bat
docker/PYROS_DOCKER_SHELL
docker/PYROS_DOCKER_SHELL.bat
docker/PYROS_DOCKER_START.bat
docker/PYROS_DOCKER_STOP.bat
docker/PYROS_DOCKER_TEST.bat
docker/PYROS_DOCKER_UPDATE.bat
src/core/pyros_django/misc/templates/base.html
src/core/pyros_django/misc/templates/base_unlogged.html
@@ -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
-docker-compose build
 \ No newline at end of file
+docker-compose build
+
@@ -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
+
-docker exec -it pyros python3 pyros.py install
 \ No newline at end of file
+docker exec -it pyros python3 pyros.py install
+
@@ -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
-docker exec -it pyros python3 pyros.py start webserver
 \ No newline at end of file
+docker exec -it pyros python3 pyros.py start webserver
+
-docker exec -it pyros python3 pyros.py start webserver
 \ No newline at end of file
+docker exec -it pyros python3 pyros.py start webserver
+
@@ -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
+
-docker exec -it pyros bash
 \ No newline at end of file
+docker exec -it pyros bash
+
-docker-compose up -d
 \ No newline at end of file
+docker-compose up -d
+
-docker-compose down
 \ No newline at end of file
+docker-compose down
+
-docker exec -it pyros python3 pyros.py test
 \ No newline at end of file
+docker exec -it pyros python3 pyros.py test
+
-docker exec -it pyros python3 pyros.py update
 \ No newline at end of file
+docker exec -it pyros python3 pyros.py update
+
@@ -10,7 +10,7 @@
     <meta name="author" content="CNRS-IRAP">
     <link rel="icon" type="image/png" href="{% static "media/colibrifavicon.png" %}"/>
-    <title>{{ request.session.obsname}} Control Center - VERSION 2021.0.1</title>
+    <title>{{ request.session.obsname}} Control Center - VERSION 2021.0.2.0</title>
     <!-- Bootstrap core CSS -->
     <link href={% static "bootstrap/css/bootstrap.css" %} rel="stylesheet">
@@ -465,6 +465,9 @@ footer{
 </body>
 <footer>
-      <i>VERSION 2021.0.1</i>
+    <!--
+      <i>VERSION 2021.0.2.0</i>
+    -->
+    <i>VERSION 0.2.0.0_2.0_20211001</i>
 </footer>
-</html>
 \ No newline at end of file
+</html>
@@ -9,7 +9,7 @@
     <meta name="description" content="Control center for the SVOM French GFT">
     <meta name="author" content="CNRS-IRAP">
-    <title>{{ request.session.obsname}} Control Center - VERSION 2021.0.1</title>
+    <title>{{ request.session.obsname}} Control Center - VERSION 2021.0.2.0</title>
     <!-- Bootstrap core CSS -->
     <link href={% static "bootstrap/css/bootstrap.css" %} rel="stylesheet">
@@ -387,6 +387,9 @@ footer{
 </body>
 <footer>
-      <i>VERSION 2021.0.1</i>
+    <!--
+      <i>VERSION 2021.0.2.0</i>
+    -->
+    <i>VERSION 0.2.0.0_2.0_20211001</i>
 </footer>
 </html>