From dc68e35339b8fbc7ecbb6a0d5d9244322434b84f Mon Sep 17 00:00:00 2001
From: L4168 <L4168@student.jamk.fi>
Date: Tue, 25 Jun 2019 11:30:51 +0300
Subject: [PATCH] gitlab-ci fix
---
.gitlab-ci.yml | 6 +++---
ormconfig.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10e5cc0..ceaf3eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,10 +12,10 @@ purge-old-containers:
- testing
script:
- echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USER" --password-stdin
- - docker stop back
- docker stop postgis
- - docker rm back
- docker rm postgis
+ - docker stop back
+ - docker rm back
after_script:
- docker logout
allow_failure: true
@@ -29,6 +29,6 @@ e2e-testing:
only:
- testing
script:
+ - docker run --name postgis -p 5432:5432 -d -v docker:/docker-entrypoint-initdb.d/ mdillon/postgis
- docker build -t backend .
- docker run --name back -p 8080:5000 -d backend
- - docker run --name postgis -p 5432:5432 -d -v docker:/docker-entrypoint-initdb.d/ mdillon/postgis
diff --git a/ormconfig.json b/ormconfig.json
index 372f7a4..3c002cc 100644
--- a/ormconfig.json
+++ b/ormconfig.json
@@ -1,7 +1,7 @@
{
"type": "postgres",
- "host": "localhost",
+ "host": "postgis",
"port": 5432,
"username": "ehasa",
"password": "salasana",
--
GitLab