EOX GitLab Instance

Skip to content
Snippets Groups Projects
Commit 1bb30d98 authored by Mussab Abdalla's avatar Mussab Abdalla
Browse files

using 'docker:19.03.1-dind' for testing

parent a5ae3bca
No related branches found
No related tags found
No related merge requests found
...@@ -74,9 +74,12 @@ build: ...@@ -74,9 +74,12 @@ build:
- master - master
test: test:
image: docker:latest image: docker:latest
variables:
DOCKER_HOST: tcp://docker:2375
DOCKER_TLS_CERTDIR: ""
stage: test stage: test
services: services:
- docker:dind - docker:19.03.1-dind
before_script: before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- chmod +x env_setup.sh wait_for_container.sh - chmod +x env_setup.sh wait_for_container.sh
......
...@@ -9,15 +9,17 @@ with open('./env/emg_db.env', 'r') as f: ...@@ -9,15 +9,17 @@ with open('./env/emg_db.env', 'r') as f:
) )
database= env['DB_NAME'].replace('\n','') database= env['DB_NAME'].replace('\n','')
port = env['DB_PORT'].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_password= env['DB_PW'].replace('\n','')
database_user = env['DB_USER'].replace('\n','') database_user = env['DB_USER'].replace('\n','')
host= os.environ.get('DOCKER_HOST')
def connect_to_db(eo_id): def connect_to_db(eo_id):
global db_name, coverage_id global db_name, coverage_id
connection= None connection= None
try: 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() cursor = connection.cursor()
db_name = connection.get_dsn_parameters()["dbname"] db_name = connection.get_dsn_parameters()["dbname"]
postgreSQL_select_Query = "SELECT identifier FROM coverages_eoobject WHERE identifier = '%s';" % eo_id postgreSQL_select_Query = "SELECT identifier FROM coverages_eoobject WHERE identifier = '%s';" % eo_id
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment