From 573dbd0470adefb36e14ed1d862ed52ac085245f Mon Sep 17 00:00:00 2001
From: FORESTIER Fabien <fabien.forestier@soprasteria.com>
Date: Fri, 4 May 2018 16:25:46 +0200
Subject: [PATCH] Display tests result on port 8083
---
.gitlab-ci.yml | 3 ++-
Dockerfile-testing | 6 +++++-
docker-compose-development.tests.yml | 12 ++++++++++++
nginx-development-tests.conf | 6 ++++++
4 files changed, 25 insertions(+), 2 deletions(-)
create mode 100644 docker-compose-development.tests.yml
create mode 100644 nginx-development-tests.conf
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f62cc6a3..6a56b350 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,8 @@ test_development:
only:
- master
script:
- - docker build -t data-reloaded-dev-testing -f Dockerfile-testing .
+ - docker-compose --project-name data-reloaded-dev-testing -f docker-compose-development.tests.yml build
+ - docker-compose --project-name data-reloaded-dev-testing -f docker-compose-development.tests.yml up -d
build_development:
stage: build
diff --git a/Dockerfile-testing b/Dockerfile-testing
index da964239..d3974c4c 100644
--- a/Dockerfile-testing
+++ b/Dockerfile-testing
@@ -1,4 +1,4 @@
-FROM docker.io/node:8-stretch
+FROM docker.io/node:8-stretch as builder
ARG DEBIAN_FRONTEND=noninteractive
@@ -17,3 +17,7 @@ WORKDIR /app/webapp
# run the test command defined in the package.json
RUN npm run test:ci
+
+FROM nginx
+
+COPY --from=builder /app/webapp/coverage /usr/share/nginx/html
diff --git a/docker-compose-development.tests.yml b/docker-compose-development.tests.yml
new file mode 100644
index 00000000..5d6a0a97
--- /dev/null
+++ b/docker-compose-development.tests.yml
@@ -0,0 +1,12 @@
+version: "2"
+
+services:
+ nginx-test:
+ build:
+ context: ./
+ dockerfile: Dockerfile-testing
+ volumes:
+ - ./nginx-development-tests.conf:/etc/nginx/conf.d/default.conf
+ ports:
+ - 8083:8083
+
\ No newline at end of file
diff --git a/nginx-development-tests.conf b/nginx-development-tests.conf
new file mode 100644
index 00000000..935c05d9
--- /dev/null
+++ b/nginx-development-tests.conf
@@ -0,0 +1,6 @@
+server {
+ listen 8083;
+ server_name portail-data;
+ root /usr/share/nginx/html/;
+
+}
--
GitLab