From 1bb30d9880fda06a5abe22c0b2a85070f25420ea Mon Sep 17 00:00:00 2001
From: Mussab Abdalla <mussab.abdalla@eox.at>
Date: Mon, 23 Mar 2020 12:24:29 +0100
Subject: [PATCH] using 'docker:19.03.1-dind' for testing
---
.gitlab-ci.yml | 5 ++++-
registrar_test.py | 6 ++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2130a7f..59dc6f94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,9 +74,12 @@ build:
- master
test:
image: docker:latest
+ variables:
+ DOCKER_HOST: tcp://docker:2375
+ DOCKER_TLS_CERTDIR: ""
stage: test
services:
- - docker:dind
+ - docker:19.03.1-dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- chmod +x env_setup.sh wait_for_container.sh
diff --git a/registrar_test.py b/registrar_test.py
index 2e03752c..d23cf3f8 100644
--- a/registrar_test.py
+++ b/registrar_test.py
@@ -9,15 +9,17 @@ with open('./env/emg_db.env', 'r') as f:
)
database= env['DB_NAME'].replace('\n','')
port = env['DB_PORT'].replace('\n','')
-host = env['DB_HOST'].replace('\n','')
+# host = env['DB_HOST'].replace('\n','')
database_password= env['DB_PW'].replace('\n','')
database_user = env['DB_USER'].replace('\n','')
+host= os.environ.get('DOCKER_HOST')
+
def connect_to_db(eo_id):
global db_name, coverage_id
connection= None
try:
- connection = psycopg2.connect(dbname=database, user=database_user, password=database_password, host='127.0.0.1', port=port)
+ connection = psycopg2.connect(dbname=database, user=database_user, password=database_password, host=host, port=port)
cursor = connection.cursor()
db_name = connection.get_dsn_parameters()["dbname"]
postgreSQL_select_Query = "SELECT identifier FROM coverages_eoobject WHERE identifier = '%s';" % eo_id
--
GitLab