From 3a2477425b7b0ae0ee077eb89ec3cf58a092cb94 Mon Sep 17 00:00:00 2001
From: L4168 <L4168@student.jamk.fi>
Date: Tue, 25 Jun 2019 09:15:33 +0300
Subject: [PATCH] setting up gitlab-ci
---
.gitignore | 1 -
.gitlab-ci.yml | 21 +++++++++++++++++++++
docker-compose.yml | 14 ++++++--------
ormconfig.json | 13 +++++++++++++
4 files changed, 40 insertions(+), 9 deletions(-)
create mode 100644 .gitlab-ci.yml
create mode 100644 ormconfig.json
diff --git a/.gitignore b/.gitignore
index fe0fe57..9db3cfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,5 @@ lerna-debug.log*
!.vscode/extensions.json
# db connection
-ormconfig.json
.env
*.providers.ts
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..5f123fa
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,21 @@
+stages:
+ - e2e-test
+
+e2e-testing:
+ image:
+ name: docker/compose:1.24.0
+ entrypoint: ['/bin/sh', '-c']
+ services:
+ - docker:dind
+ stage: e2e-test
+ tags: ['compose']
+ only:
+ - testing
+ before_script:
+ - echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USER" --password-stdin
+ script:
+ - docker image prune -f
+ - docker-compose build --no-cache
+ - docker-compose up -d
+ after_script:
+ - docker logout
diff --git a/docker-compose.yml b/docker-compose.yml
index 7ac4913..fd068d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,14 @@
-version: "3"
+version: '3'
services:
ehasa-frontend:
- image: "ehasa/frontend"
+ image: overflow2019/frontend:test
ports:
- - 8080:80
+ - 80:80
ehasa-backend:
- image: "ehasa/backend"
+ build: .
ports:
- - 5000:5000
+ - 8080:5000
postgres:
image: mdillon/postgis
volumes:
- - /home/postgres:/var/lib/postgresql/data
- ports:
- - 5432:5432
\ No newline at end of file
+ - ./docker:/docker-entrypoint-initdb.d/
\ No newline at end of file
diff --git a/ormconfig.json b/ormconfig.json
new file mode 100644
index 0000000..372f7a4
--- /dev/null
+++ b/ormconfig.json
@@ -0,0 +1,13 @@
+
+{
+ "type": "postgres",
+ "host": "localhost",
+ "port": 5432,
+ "username": "ehasa",
+ "password": "salasana",
+ "database": "ehasa",
+ "entities": ["src/**/*.entity{.ts,.js}"],
+ "synchronize": true,
+ "logging": true,
+ "dropSchema": false
+ }
\ No newline at end of file
--
GitLab