From 2a5ac0a4e3dc6a25d4e4aab0367721bf22a6c8de Mon Sep 17 00:00:00 2001
From: L4168 <L4168@student.jamk.fi>
Date: Tue, 25 Jun 2019 11:56:46 +0300
Subject: [PATCH] gitlab-ci fixing
---
.gitlab-ci.yml | 24 +++++++++++-------------
docker-compose.yml | 11 +++++++++++
2 files changed, 22 insertions(+), 13 deletions(-)
create mode 100644 docker-compose.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ceaf3eb..3af738b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,24 +11,22 @@ purge-old-containers:
only:
- testing
script:
- - echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USER" --password-stdin
- - docker stop postgis
- - docker rm postgis
- - docker stop back
- - docker rm back
- after_script:
- - docker logout
+ - docker-compose down
allow_failure: true
-e2e-testing:
- image: docker
+ e2e-testing:
+ image:
+ name: docker/compose:1.24.0
+ entrypoint: ['/bin/sh', '-c']
services:
- docker:dind
stage: e2e-test
- tags: ['docker']
+ tags: ['compose']
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 image prune -f
+ - docker-compose build --no-cache
+ - docker-compose up -d
+ allow_failure: true
+
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..100676a
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '3'
+ services:
+ ehasa-backend:
+ build: .
+ ports:
+ - 8080:5000
+ postgres:
+ image: mdillon/postgis
+ container_name: postgis
+ volumes:
+ - ./docker:/docker-entrypoint-initdb.d/
\ No newline at end of file
--
GitLab