PYROS-IRAP / pyros

Commit 0e02606ce5c1ea7c981e595d8c76f238f393537f

Authored by Etienne Pallier
1 parent 025cf279
Exists in dev

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

Showing 15 changed files with 37 additions and 16 deletions   Show diff stats
Inline Side-by-side
.gitignore
  Diff comments   View file @0e02606
... ... @@ -5,6 +5,9 @@ __pycache__
5 5 *.pyc
6 6 *.py.bak
7 7  
  8 +BASE_TEMPLATE_UNLOGGED.HTML
  9 +BASE_TEMPLATE.HTML
  10 +
8 11 # Ignore all PNG files except from src/doc/ and src/core/pyros_django/misc/static/media/
9 12 *.png
10 13 !src/doc/*.png
... ...
docker/PYROS_DOCKER_BUILD.bat
  Diff comments   View file @0e02606
1   -docker-compose build
2 1 \ No newline at end of file
  2 +docker-compose build
  3 +
... ...
docker/PYROS_DOCKER_INSTALL
  Diff comments   View file @0e02606
... ... @@ -17,3 +17,4 @@ do
17 17 done
18 18 # db container is ready to execture queries, we can start the installation
19 19 docker exec -it pyros python3 pyros.py install
  20 +
... ...
docker/PYROS_DOCKER_INSTALL.bat
  Diff comments   View file @0e02606
1   -docker exec -it pyros python3 pyros.py install
2 1 \ No newline at end of file
  2 +docker exec -it pyros python3 pyros.py install
  3 +
... ...
docker/PYROS_DOCKER_RUN
  Diff comments   View file @0e02606
... ... @@ -11,7 +11,8 @@ fi
11 11 # - Display log on current terminal
12 12 #docker exec -it pyros python3 pyros.py start webserver $@
13 13 # - Save log in file
14   -docker exec pyros python3 pyros.py start webserver $@ > ../../LOG_PYROS_webserver.log 2>&1 &
  14 +#docker exec pyros python3 pyros.py start webserver $@ > ../../LOG_PYROS_webserver.log 2>&1 &
  15 +docker exec pyros python3 pyros.py start webserver > ../../LOG_PYROS_webserver.log 2>&1 &
15 16  
16 17 # 2) PLC simulator
17 18 # - Display log on current terminal
... ...
docker/PYROS_DOCKER_RUN.bat
  Diff comments   View file @0e02606
1   -docker exec -it pyros python3 pyros.py start webserver
2 1 \ No newline at end of file
  2 +docker exec -it pyros python3 pyros.py start webserver
  3 +
... ...
docker/PYROS_DOCKER_RUN_WEBSERVER_ONLY.bat
  Diff comments   View file @0e02606
1   -docker exec -it pyros python3 pyros.py start webserver
2 1 \ No newline at end of file
  2 +docker exec -it pyros python3 pyros.py start webserver
  3 +
... ...
docker/PYROS_DOCKER_SHELL
  Diff comments   View file @0e02606
... ... @@ -6,4 +6,5 @@ then
6 6 echo "db_pyros or pyros weren't running, starting them..."
7 7 ./PYROS_DOCKER_START.bat
8 8 fi
9   -docker exec -it pyros bash
10 9 \ No newline at end of file
  10 +docker exec -it pyros bash
  11 +
... ...
docker/PYROS_DOCKER_SHELL.bat
  Diff comments   View file @0e02606
1   -docker exec -it pyros bash
2 1 \ No newline at end of file
  2 +docker exec -it pyros bash
  3 +
... ...
docker/PYROS_DOCKER_START.bat
  Diff comments   View file @0e02606
1   -docker-compose up -d
2 1 \ No newline at end of file
  2 +docker-compose up -d
  3 +
... ...
docker/PYROS_DOCKER_STOP.bat
  Diff comments   View file @0e02606
1   -docker-compose down
2 1 \ No newline at end of file
  2 +docker-compose down
  3 +
... ...
docker/PYROS_DOCKER_TEST.bat
  Diff comments   View file @0e02606
1   -docker exec -it pyros python3 pyros.py test
2 1 \ No newline at end of file
  2 +docker exec -it pyros python3 pyros.py test
  3 +
... ...
docker/PYROS_DOCKER_UPDATE.bat
  Diff comments   View file @0e02606
1   -docker exec -it pyros python3 pyros.py update
2 1 \ No newline at end of file
  2 +docker exec -it pyros python3 pyros.py update
  3 +
... ...
src/core/pyros_django/misc/templates/base.html
  Diff comments   View file @0e02606
... ... @@ -10,7 +10,7 @@
10 10 <meta name="author" content="CNRS-IRAP">
11 11 <link rel="icon" type="image/png" href="{% static "media/colibrifavicon.png" %}"/>
12 12  
13   - <title>{{ request.session.obsname}} Control Center - VERSION 2021.0.1</title>
  13 + <title>{{ request.session.obsname}} Control Center - VERSION 2021.0.2.0</title>
14 14  
15 15 <!-- Bootstrap core CSS -->
16 16 <link href={% static "bootstrap/css/bootstrap.css" %} rel="stylesheet">
... ... @@ -465,6 +465,9 @@ footer{
465 465  
466 466 </body>
467 467 <footer>
468   - <i>VERSION 2021.0.1</i>
  468 + <!--
  469 + <i>VERSION 2021.0.2.0</i>
  470 + -->
  471 + <i>VERSION 0.2.0.0_2.0_20211001</i>
469 472 </footer>
470   -</html>
471 473 \ No newline at end of file
  474 +</html>
... ...
src/core/pyros_django/misc/templates/base_unlogged.html
  Diff comments   View file @0e02606
... ... @@ -9,7 +9,7 @@
9 9 <meta name="description" content="Control center for the SVOM French GFT">
10 10 <meta name="author" content="CNRS-IRAP">
11 11  
12   - <title>{{ request.session.obsname}} Control Center - VERSION 2021.0.1</title>
  12 + <title>{{ request.session.obsname}} Control Center - VERSION 2021.0.2.0</title>
13 13  
14 14 <!-- Bootstrap core CSS -->
15 15 <link href={% static "bootstrap/css/bootstrap.css" %} rel="stylesheet">
... ... @@ -387,6 +387,9 @@ footer{
387 387  
388 388 </body>
389 389 <footer>
390   - <i>VERSION 2021.0.1</i>
  390 + <!--
  391 + <i>VERSION 2021.0.2.0</i>
  392 + -->
  393 + <i>VERSION 0.2.0.0_2.0_20211001</i>
391 394 </footer>
392 395 </html>
... ...