##// END OF EJS Templates
Nos quedamos estancados con el cambio de tamaño del diccionario
Renato-TUF -
r356:fae7c72f4b68
parent child
Show More
@@ -1,42 +1,42
1 1 {% extends "base.html" %}
2 2 {% load django_bootstrap5 %}
3 3 {% load static %}
4 4 {% load main_tags %}
5 5
6 6 {% block content-title %}{{title}}{% endblock %}
7 7 {% block content-suptitle %}{{suptitle}}{% endblock %}
8 8
9 9 {% block content %}
10 10 {% if form.is_multipart %}
11 11 <form class="form" enctype="multipart/form-data" method="post" action="{{action}}">
12 12 {% else %}
13 13 <form class="form" method="post" action="{{action}}">
14 14 {% endif %}
15 15 {% csrf_token %}
16 16
17 17 {% if device_dds == 'dds_rest' %}
18 18 {% block dds_rest%}
19 19 {% endblock %}
20 20 {% else %}
21 {% bootstrap_form form layout='horizontal' size='medium' %}
21 {% bootstrap_form form layout='horizontal' size='md' %}
22 22 {% endif %}
23 23
24 24 <div style="clear: both;"></div>
25 25 <br>
26 26 {% if extra_button %}
27 27 <div class="pull-left">
28 28 <button type="button" class="btn btn-primary" id="bt_{{extra_button}}">{{extra_button}}</button>
29 29 </div>
30 30 {% endif %}
31 31 {% if button %}
32 32 <div class="pull-right">
33 33 <button type="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">{% if cancel %}{{cancel}}{% else %}Cancel{% endif %}</button>
34 34 <button type="submit" class="btn btn-primary">{{button}}</button>
35 35 </div>
36 36 {% endif %}
37 37 </form>
38 38 {% endblock %}
39 39
40 40 {% block sidebar%}
41 41 {% include "sidebar_devices.html" %}
42 42 {% endblock %}
@@ -1,68 +1,68
1 1 version: '2'
2 2 services:
3 3 # Django app
4 4 web:
5 5 container_name: 'radarsys'
6 6 build: .
7 7 restart: always
8 8 image: radarsys
9 command: gunicorn radarsys.wsgi:application -w 2 -b :8000
10 # command: python manage.py runserver 0.0.0.0:8030
11 # ports:
12 # - 8030:8030
9 # command: gunicorn radarsys.wsgi:application -w 2 -b :8000
10 command: python manage.py runserver 0.0.0.0:8030
11 ports:
12 - 8030:8030
13 13 env_file: .env
14 14
15 15 links:
16 - redis
16 # - redis
17 17 - postgres
18 18 volumes:
19 19 - './:/radarsys'
20 20 - '${DOCKER_DATA}/static:/radarsys/static'
21 21 depends_on:
22 - redis
22 # - redis
23 23 - postgres
24 24
25 redis:
26 container_name: 'radarsys-redis'
27 image: 'redis:3.2-alpine'
28 volumes:
29 - '${DOCKER_DATA}/redis:/data'
25 # redis:
26 # container_name: 'radarsys-redis'
27 # image: 'redis:3.2-alpine'
28 # volumes:
29 # - '${DOCKER_DATA}/redis:/data'
30 30
31 31 # celery_worker:
32 32 # container_name: 'radarsys-celery'
33 33 # image: radarsys
34 34 # env_file: .env
35 35 # command: celery -A radarsys worker -l info
36 36 # volumes_from:
37 37 # - web
38 38 # depends_on:
39 39 # - web
40 40
41 41 # PostgreSQL
42 42 postgres:
43 43 container_name: 'radarsys-postgres'
44 44 build: ./postgres/
45 45 volumes:
46 46 - ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
47 47 - pgdata:/var/lib/postgresql/data
48 48 # ports:
49 49 # - 5432:5432
50 50 env_file: .env
51 51
52 52 # Web Server
53 nginx:
54 container_name: 'radarsys-nginx'
55 restart: always
56 build: ./nginx/
57 ports:
58 - '8030:8030'
59 volumes_from:
60 - web
61 links:
62 - web:web
63 depends_on:
64 - web
53 # nginx:
54 # container_name: 'radarsys-nginx'
55 # restart: always
56 # build: ./nginx/
57 # ports:
58 # - '8030:8030'
59 # volumes_from:
60 # - web
61 # links:
62 # - web:web
63 # depends_on:
64 # - web
65 65
66 66 volumes:
67 67 pgdata:
68 68 driver: local
General Comments 0
You need to be logged in to leave comments. Login now