From f97a416b70542a766ecbbfb9a0e9ede5116d8c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bertrand=20N=C3=A9ron?= <bneron@pasteur.fr>
Date: Thu, 20 Apr 2017 16:55:40 +0200
Subject: [PATCH] add psutil in docker image as craw dependence
and rename images
---
.gitlab-ci.yml | 25 ++++++++++++-------
Docker/Docker_coverage/Dockerfile | 2 +-
.../Dockerfile | 0
Docker/Docker_release/Dockerfile | 2 +-
4 files changed, 18 insertions(+), 11 deletions(-)
rename Docker/{Docker_pages => Docker_deploy}/Dockerfile (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca80dff..5937218 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
testing:
stage: test
- image: registry-gitlab.pasteur.fr/bneron/craw:centos-dep-0.6
+ image: registry-gitlab.pasteur.fr/bneron/craw:centos-run-dep
script:
- python3 ${CI_PROJECT_DIR}/tests/run_tests.py -vvv
except:
@@ -22,14 +22,19 @@ coverage:
script:
- cd ${CI_PROJECT_DIR}
- coverage run --source=craw tests/run_tests.py --unit
+ - coverage html
- coverage report
+ artifacts:
+ paths: htmlcov/
except:
- /^feat.*$/
- /^fix.*$/
releasing:
stage: release
- image: registry-gitlab.pasteur.fr/bneron/craw:release-0.6
+ image: registry-gitlab.pasteur.fr/bneron/craw:release
+ dependencies:
+ - test
script:
- cd ${CI_PROJECT_DIR}/doc/
- make html
@@ -39,22 +44,24 @@ releasing:
artifacts:
name: craw-"$CI_COMMIT_REF_NAME".tar.gz
paths:
- - dist/craw*.tar.gz
+ - dist/craw*.tar.gz
only:
- tags
- master
pages:
- image: registry-gitlab.pasteur.fr/bneron/craw:pages
+ stage: release
+ image: registry-gitlab.pasteur.fr/bneron/craw:release
+ dependencies:
+ - coverage
script:
- - cd ${CI_PROJECT_DIR}
- - coverage run --source=craw tests/run_tests.py --unit
- - coverage html
- cd ${CI_PROJECT_DIR}/doc/
- make html
+ - cd ${CI_PROJECT_DIR}
+ - mv ${CI_PROJECT_DIR}/doc/build/html/ public
+ - mv htmlcov public/
artifacts:
paths:
- - ${CI_PROJECT_DIR}/htmlcov
- - ${CI_PROJECT_DIR}/doc/build/html
+ - public
only:
- master
\ No newline at end of file
diff --git a/Docker/Docker_coverage/Dockerfile b/Docker/Docker_coverage/Dockerfile
index f26d1ce..6fc2487 100644
--- a/Docker/Docker_coverage/Dockerfile
+++ b/Docker/Docker_coverage/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry-gitlab.pasteur.fr/bneron/craw:centos-dep-0.6
+FROM registry-gitlab.pasteur.fr/bneron/craw:centos-run-dep
MAINTAINER Bertrand Neron <bneron@pasteur.fr>
diff --git a/Docker/Docker_pages/Dockerfile b/Docker/Docker_deploy/Dockerfile
similarity index 100%
rename from Docker/Docker_pages/Dockerfile
rename to Docker/Docker_deploy/Dockerfile
diff --git a/Docker/Docker_release/Dockerfile b/Docker/Docker_release/Dockerfile
index 4840b14..8959482 100644
--- a/Docker/Docker_release/Dockerfile
+++ b/Docker/Docker_release/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry-gitlab.pasteur.fr/bneron/craw:centos-dep-0.6
+FROM registry-gitlab.pasteur.fr/bneron/craw:centos-run-dep
MAINTAINER Bertrand Neron <bneron@pasteur.fr>
--
GitLab