diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f62cc6a3c707893a9dace7b71ec7e72c2bfa3552..6a56b350ed7e8b92f3113dae4d5a800e225cff92 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 da964239e17ec7162888b0c896651a4535c76725..d3974c4c54c908e8db6c5189071ca633d3eca6d3 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 0000000000000000000000000000000000000000..5d6a0a9737820ead473af5b6aa41a374f409e7e7 --- /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 0000000000000000000000000000000000000000..935c05d9e1cb3b432e9b9cb036bc0feea9c16794 --- /dev/null +++ b/nginx-development-tests.conf @@ -0,0 +1,6 @@ +server { + listen 8083; + server_name portail-data; + root /usr/share/nginx/html/; + +}