From d9b8f3a1ebf07af51c5cb80e1e7bb7402113dc67 Mon Sep 17 00:00:00 2001
From: Pavel Kirilin <win10@list.ru>
Date: Mon, 9 Dec 2019 03:12:27 +0400
Subject: [PATCH] Added makefile. Description: - To run project: make - To test
project: make test - To cleanup: make clean - To cleanup after failed tests:
make clean_test
Signed-off-by: Pavel Kirilin <win10@list.ru>
---
Makefile | 18 ++++++++++++++++++
docker-compose.test.yml | 20 ++++++++++++++++++++
docker-compose.yml | 2 +-
3 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 Makefile
create mode 100644 docker-compose.test.yml
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..2331ff9
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,18 @@
+all: run
+
+clean:
+ @docker-compose -f docker-compose.yml down
+
+clean_test:
+ @docker-compose -f docker-compose.test.yml down
+
+_run_tests:
+ @docker-compose -f docker-compose.test.yml run test_builder mvn test
+
+build:
+ @docker-compose build
+
+test: _run_tests clean_test
+
+run:
+ @docker-compose -f docker-compose.yml up
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
new file mode 100644
index 0000000..37288f4
--- /dev/null
+++ b/docker-compose.test.yml
@@ -0,0 +1,20 @@
+version: '3.7'
+
+services:
+ test_builder:
+ build: .
+ container_name: 'test_corporate_builder'
+ volumes:
+ - .:/app/
+ working_dir: '/app/'
+ depends_on:
+ - test_db
+ command: mvn clean test
+
+ test_db:
+ image: 'postgres:10-alpine'
+ container_name: 'test_corporate_db'
+ environment:
+ POSTGRES_DB: cinema
+ POSTGRES_USER: postgres
+ POSTGRES_PASSWORD: postgres
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 8de8dc7..834b429 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,7 +35,7 @@ services:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
volumes:
- - ./db_data:/var/lib/postgresql/data
+ - .db_data:/var/lib/postgresql/data
adminer:
image: adminer
--
GitLab