##// END OF EJS Templates
radarsys_met
RSS
Update docker configurations
jespinoza -
r300:c6aee8aed3f9
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,4 +1,5
1 HOST_REDIS=radarsys-redis
1 REDIS_HOST=radarsys-redis
2 REDIS_PORT=6379
2 POSTGRES_DB_NAME=radarsys
3 POSTGRES_DB_NAME=radarsys
3 POSTGRES_PORT_5432_TCP_ADDR=radarsys-postgres
4 POSTGRES_PORT_5432_TCP_ADDR=radarsys-postgres
4 POSTGRES_PORT_5432_TCP_PORT=5432
5 POSTGRES_PORT_5432_TCP_PORT=5432
Show file before | Show file after | Hide comments
@@ -18,6 +18,3 COPY . ./
18
18
19 EXPOSE 8000
19 EXPOSE 8000
20
20
21 RUN python manage.py collectstatic --noinput
22
23
Show file before | Show file after | Hide comments
@@ -22,8 +22,6 services:
22 redis:
22 redis:
23 container_name: 'radarsys-redis'
23 container_name: 'radarsys-redis'
24 image: 'redis:3.2-alpine'
24 image: 'redis:3.2-alpine'
25 ports:
26 - '127.0.0.1:6300:6379'
27 volumes:
25 volumes:
28 - '/data/dockers/radarsys/redis:/data'
26 - '/data/dockers/radarsys/redis:/data'
29
27
@@ -41,8 +39,6 services:
41 postgres:
39 postgres:
42 container_name: 'radarsys-postgres'
40 container_name: 'radarsys-postgres'
43 build: ./postgres/
41 build: ./postgres/
44 ports:
45 - 5432:5432
46 volumes:
42 volumes:
47 - ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
43 - ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
48 - pgdata:/var/lib/postgresql/data
44 - pgdata:/var/lib/postgresql/data
Show file before | Show file after | Hide comments
@@ -1,3 +1,5
1 #!/bin/env bash
1 #!/bin/env bash
2 psql -U postgres -c "CREATE USER $POSTGRES_USER PASSWORD '$POSTGRES_PASSWORD'"
2 echo "Creating database..."
3 psql -U postgres -c "CREATE DATABASE $POSTGRES_DB_NAME OWNER $POSTGRES_USER" No newline at end of file
3 psql -U postgres -c "CREATE USER $POSTGRES_USER WITH PASSWORD '$POSTGRES_PASSWORD'; CREATE ROLE "
4 psql -U postgres -c "CREATE DATABASE $POSTGRES_DB_NAME; CREATE DATABASE "
5 psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE $POSTGRES_DB_NAME to $POSTGRES_USER; GRANT "
Show file before | Show file after | Hide comments
@@ -122,12 +122,13 STATICFILES_FINDERS = (
122 )
122 )
123
123
124 # Celery stuff
124 # Celery stuff
125 REDIS_HOST = os.environ.get('HOST_REDIS', '127.0.0.1')
125 REDIS_HOST = os.environ.get('REDIS_HOST', '127.0.0.1')
126 REDIS_PORT = os.environ.get('REDIS_PORT', 6379)
126
127
127 BROKER_TRANSPORT = 'redis'
128 BROKER_TRANSPORT = 'redis'
128 BROKER_URL = 'redis://%s:6379/0' % REDIS_HOST
129 BROKER_URL = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
129
130
130 CELERY_RESULT_BACKEND = 'redis://%s:6379/0' % REDIS_HOST
131 CELERY_RESULT_BACKEND = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
131 CELERY_BROKER_TRANSPORT = BROKER_URL
132 CELERY_BROKER_TRANSPORT = BROKER_URL
132 CELERY_ACCEPT_CONTENT = ['application/json']
133 CELERY_ACCEPT_CONTENT = ['application/json']
133 CELERY_TASK_SERIALIZER = 'json'
134 CELERY_TASK_SERIALIZER = 'json'
General Comments 0
You need to be logged in to leave comments. Login now