Merge branch 'master' of github.com:sebastienpro/Quizz

Author: smendes

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 RUN apt-get update && apt-get install -y git python3-dev curl netcat python3-pip
 

Quizz/settings.py

@@ -92,6 +92,12 @@
     }
 }
 
+REDIS = {
+    'host': os.environ.get('REDIS_HOST', 'localhost'),
+    'port': int(os.environ.get('REDIS_PORT', 6379)),
+    'database': os.environ.get('REDIS_DATABASE', 1),
+}
+
 
 # Password validation
 # https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators

docker-compose.yml

@@ -4,6 +4,8 @@ services:
     build: ./
     ports:
       - "8000"
+    environment:
+      - REDIS_HOST=redis
     volumes:
       - "./:/usr/src/app"
     labels:
@@ -34,6 +36,11 @@ services:
     volumes:
       - "./pgVolume:/var/lib/postgresql/data"
 
+  redis:
+    image: "redis"
+    ports:
+      - "6379:6379"
+
   traefik:
     image: containous/traefik:latest
     ports: