From d0543bd17b4775744db773af613bc71f2f70a6b3 Mon Sep 17 00:00:00 2001
From: Kenzo-Hugo Hillion <kenzo-hugo.hillion1@pasteur.fr>
Date: Tue, 4 Jun 2019 16:07:59 +0200
Subject: [PATCH] add env variable to specify if web is on docker or not
---
docker-compose.yaml | 5 +++++
web/Dockerfile | 1 +
web/metagenedb/settings.py | 9 ++++++---
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 34ab84d..afc32a2 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -18,3 +18,8 @@ services:
image: postgres:latest
ports:
- "5433:5432"
+ volumes:
+ - db-data:/var/lib/postgresql/data
+
+volumes:
+ db-data:
diff --git a/web/Dockerfile b/web/Dockerfile
index 808297d..492397b 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -2,6 +2,7 @@ FROM python:3.7
ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1
+ENV WEB_DOCKER 1
WORKDIR /metagenedb
diff --git a/web/metagenedb/settings.py b/web/metagenedb/settings.py
index b914db1..11eaf3d 100644
--- a/web/metagenedb/settings.py
+++ b/web/metagenedb/settings.py
@@ -26,7 +26,7 @@ SECRET_KEY = '01^q5^z**8vfdd$u4&b0w!2thaj=3b93+i*v$&kwmz6&ix6x8)'
DEBUG = True
# This can be used to toggle between your local testing db (db.sqlite3) and the PostgreSQL backend:
-DOCKER = True
+DOCKER = os.environ.get('WEB_DOCKER', False)
if DEBUG:
# This value is not safe for production usage. Refer to the Django documentation for more information.
@@ -91,8 +91,11 @@ if DOCKER:
else:
DATABASES = {
'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+ 'ENGINE': 'django.db.backends.postgresql',
+ 'NAME': 'postgres',
+ 'USER': 'postgres',
+ 'HOST': 'localhost',
+ 'PORT': 5433,
}
}
--
GitLab