From 4e588bb2845f72dc125966c8d4c5334850a389fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= <kervella.mael@gmail.com>
Date: Tue, 26 Jun 2018 15:59:18 +0000
Subject: [PATCH] Try using postgres service

---
 .gitlab-ci.yml  | 6 ++++++
 install_re2o.sh | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bcfd934c..06a557db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,12 @@ variables:
   LANG: 'en_US.UTF-8'
   LC_ALL: 'en_US.UTF-8'
   LANGUAGE: 'en_US.UTF-8'
+  POSTGRES_DB: re2o
+  POSTGRES_USER: re2o
+  POSTGRES_PASSWORD: re2o
+
+services:
+  - postgres:latest
 
 image: debian:stretch
 stages:
diff --git a/install_re2o.sh b/install_re2o.sh
index cdca3a80..b5eac328 100755
--- a/install_re2o.sh
+++ b/install_re2o.sh
@@ -839,9 +839,8 @@ main_function() {
 
         ci-setup )
             install_requirements
-            install_database 2 1 re2o re2o re2o
             install_ldap 1 re2o "dc=example,dc=net"
-            write_settings_file 2 localhost re2o re2o re2o \
+            write_settings_file 2 postgres re2o re2o re2o \
                 "cn=admin,dc=example,dc=net" 2 re2o localhost "dc=example,dc=net" \
                 "mailserver.example.net" 25 "example.net" "re2o.example.net"
             update_django