Permalink
Browse files

Update docker config and files

  • Loading branch information...
overshard committed Oct 20, 2018
1 parent 0865610 commit ffd1244916734ba61ab3292f9e8977df5d7d4a74
Showing with 22 additions and 5 deletions.
  1. +4 −3 Dockerfile
  2. +3 −0 docker-compose.yml
  3. +2 −2 package.json
  4. +13 −0 timestrap/settings/docker.py
View
@@ -3,10 +3,11 @@ WORKDIR /build
COPY . /build
RUN npm i -g npm
RUN npm i --production
RUN npm i -g npm gulp-cli
RUN npm i
RUN npm rebuild node-sass --force
RUN npx webpack
RUN gulp build:production
FROM python:3.6
View
@@ -7,13 +7,16 @@ services:
- PGDATA=/db-data
volumes:
- db:/db-data
redis:
image: redis
web:
build: .
command: daphne timestrap.asgi:application --port 80 --bind 0.0.0.0 -v2
ports:
- "80:80"
depends_on:
- db
- redis
environment:
- SECRET_KEY=CHANGE-ME
View
@@ -12,8 +12,8 @@
"version": "1.0.0-alpha",
"license": "BSD-2-Clause",
"engines": {
"node": "^8.10.0",
"npm": "^6.1.0"
"node": "^8.12.0",
"npm": "^6.4.1"
},
"devDependencies": {
"babel-core": "^6.26.3",
@@ -28,6 +28,19 @@
}
# Channels
# https://channels.readthedocs.io/en/latest/
CHANNEL_LAYERS = {
'default': {
'BACKEND': 'channels_redis.core.RedisChannelLayer',
'CONFIG': {
'hosts': [('redis', 6379)],
},
},
}
# Email
if os.environ.get('EMAIL_HOST'): # noqa: E501,F405

0 comments on commit ffd1244

Please sign in to comment.