From 515f11a8e1fa2bab150e1f827c7fd697516c0718 Mon Sep 17 00:00:00 2001
From: Thomas MENARD <thomas.menard@pasteur.fr>
Date: Tue, 4 Jun 2019 19:45:35 +0200
Subject: [PATCH] Update mysite/settings.py, manifest.yaml files
---
manifest.yaml | 4 ++++
mysite/settings.py | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/manifest.yaml b/manifest.yaml
index f660868..a6ed8df 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -109,6 +109,8 @@ spec:
image: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:${CI_COMMIT_SHORT_SHA}
imagePullPolicy: Always
env:
+ - name: DATABASE_HOST
+ value: postgresql
- name: DATABASE_NAME
valueFrom:
secretKeyRef:
@@ -178,6 +180,8 @@ spec:
image: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:${CI_COMMIT_SHORT_SHA}
command: ['python', '/app/manage.py', 'migrate']
env:
+ - name: DATABASE_HOST
+ value: postgresql
- name: DATABASE_NAME
valueFrom:
secretKeyRef:
diff --git a/mysite/settings.py b/mysite/settings.py
index 4baea88..d56e54f 100755
--- a/mysite/settings.py
+++ b/mysite/settings.py
@@ -82,7 +82,7 @@ DATABASES = {
# If you are using Cloud SQL for MySQL rather than PostgreSQL, set
# 'ENGINE': 'django.db.backends.mysql' instead of the following.
'ENGINE': 'django.db.backends.postgresql',
- 'NAME': 'polls',
+ 'NAME': os.getenv('DATABASE_NAME'),
'USER': os.getenv('DATABASE_USER'),
'PASSWORD': os.getenv('DATABASE_PASSWORD'),
'HOST': os.getenv('DATABASE_HOST'),
--
GitLab