Update docker config and files

overshard · Oct 20, 2018 · ffd1244 · ffd1244
1 parent 0865610
commit ffd1244
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -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

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -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
 

diff --git a/package.json b/package.json
@@ -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",

diff --git a/timestrap/settings/docker.py b/timestrap/settings/docker.py
@@ -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