##// END OF EJS Templates
Update docker configuration & fix timezone
Juan C. Espinoza -
r305:a055088a3559
parent child
Show More
@@ -7,3 +7,5 POSTGRES_USER=docker
7 POSTGRES_PASSWORD=docker
7 POSTGRES_PASSWORD=docker
8 PGDATA=/var/lib/postgresql/data
8 PGDATA=/var/lib/postgresql/data
9 LC_ALL=C.UTF-8
9 LC_ALL=C.UTF-8
10 TZ=America/Lima
11 DOCKER_DATA=/Volumes/dockers/radarsys/
@@ -9,7 +9,7 ADD requirements.txt ./requirements.txt
9 RUN apt-get clean && apt-get update && apt-get install -y --no-install-recommends \
9 RUN apt-get clean && apt-get update && apt-get install -y --no-install-recommends \
10 gcc \
10 gcc \
11 g++ \
11 g++ \
12 && pip install -v --timeout 120 -r requirements.txt --no-cache-dir --index-url http://10.10.20.128:8010/simple --trusted-host 10.10.20.128 \
12 && pip install -v --timeout 120 -r requirements.txt --no-cache-dir \
13 && apt-get purge -y --auto-remove gcc g++\
13 && apt-get purge -y --auto-remove gcc g++\
14 && rm -rf /var/lib/apt/lists/*
14 && rm -rf /var/lib/apt/lists/*
15
15
@@ -7,6 +7,9 services:
7 restart: always
7 restart: always
8 image: radarsys
8 image: radarsys
9 command: gunicorn radarsys.wsgi:application -w 2 -b :8000
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
10 env_file: .env
13 env_file: .env
11
14
12 links:
15 links:
@@ -14,7 +17,7 services:
14 - postgres
17 - postgres
15 volumes:
18 volumes:
16 - './:/radarsys'
19 - './:/radarsys'
17 - '/data/dockers/radarsys/static:/radarsys/static'
20 - '${DOCKER_DATA}/static:/radarsys/static'
18 depends_on:
21 depends_on:
19 - redis
22 - redis
20 - postgres
23 - postgres
@@ -23,7 +26,7 services:
23 container_name: 'radarsys-redis'
26 container_name: 'radarsys-redis'
24 image: 'redis:3.2-alpine'
27 image: 'redis:3.2-alpine'
25 volumes:
28 volumes:
26 - '/data/dockers/radarsys/redis:/data'
29 - '${DOCKER_DATA}/redis:/data'
27
30
28 celery_worker:
31 celery_worker:
29 container_name: 'radarsys-celery'
32 container_name: 'radarsys-celery'
@@ -99,7 +99,7 DATABASES = {
99
99
100 LANGUAGE_CODE = 'en-us'
100 LANGUAGE_CODE = 'en-us'
101
101
102 TIME_ZONE = None
102 TIME_ZONE = os.environ.get('TZ', 'UTC')
103
103
104 USE_I18N = True
104 USE_I18N = True
105
105
@@ -133,4 +133,4 CELERY_BROKER_TRANSPORT = BROKER_URL
133 CELERY_ACCEPT_CONTENT = ['application/json']
133 CELERY_ACCEPT_CONTENT = ['application/json']
134 CELERY_TASK_SERIALIZER = 'json'
134 CELERY_TASK_SERIALIZER = 'json'
135 CELERY_RESULT_SERIALIZER = 'json'
135 CELERY_RESULT_SERIALIZER = 'json'
136 CELERY_TIMEZONE = 'America/Lima'
136 CELERY_ENABLE_UTC = False No newline at end of file
@@ -1,7 +1,7
1 Django==1.10.1
1 Django==1.10.1
2 django-bootstrap3
2 django-bootstrap3
3 psycopg2
3 psycopg2-binary
4 django-polymorphic
4 django-polymorphic==1.3
5 bokeh==0.12.1
5 bokeh==0.12.1
6 numpy==1.13.3
6 numpy==1.13.3
7 matplotlib
7 matplotlib
General Comments 0
You need to be logged in to leave comments. Login now