From abcaa64962d168f7547e907b3317e8a9eb318a67 Mon Sep 17 00:00:00 2001
From: Denis Arrivault <denis.arrivault@lif.univ-mrs.fr>
Date: Mon, 15 May 2017 18:52:03 +0200
Subject: [PATCH] Correction of docker images and gitalb-ci script
---
.gitlab-ci.yml | 40 +++++++++++++++++++++++-----------------
docker/Dockerfile_X86_64 | 9 +++++----
docker/Dockerfile_i686 | 8 +++-----
3 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3965690..3dba454 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,31 @@
# CI Config for ltaftpy / gitlab
-# nosetests template
-.nose: &nose
+# Tests on X86_64 ubuntu
+unbutu:X86_64:
+ image: registry.gitlab.lif.univ-mrs.fr:5005/dev/ltfatpy/ubuntu:X86_64
+ tags:
+ - docker
script:
- - pip3 install -e .
+ - pip install -e .
+ - nosetests
+ artifacts:
+ when: always
+ untracked: true
+ paths:
+ - build
+ expire_in: 8d
+
+# Tests on i686 ubuntu
+ubuntu:i686:
+ image: registry.gitlab.lif.univ-mrs.fr:5005/dev/ltfatpy/ubuntu:i686
+ tags:
+ - docker
+ script:
+ - pip install -e .
- nosetests3
artifacts:
+ when: always
+ untracked: true
paths:
- build
expire_in: 8d
@@ -20,20 +40,6 @@
paths:
- public
-# Tests on X86_64 ubuntu
-unbutu:X86_64:
- <<: *nose
- image: registry.gitlab.lif.univ-mrs.fr:5005/dev/ltfatpy/ubuntu:X86_64
- tags:
- - docker
-
-# Tests on i686 ubuntu
-ubuntu:i686:
- <<: *nose
- image: registry.gitlab.lif.univ-mrs.fr:5005/dev/ltfatpy/ubuntu:i686
- tags:
- - docker
-
# Doc Generation
pages:
<<: *doc
diff --git a/docker/Dockerfile_X86_64 b/docker/Dockerfile_X86_64
index 6119823..f5deb7c 100644
--- a/docker/Dockerfile_X86_64
+++ b/docker/Dockerfile_X86_64
@@ -11,14 +11,15 @@ RUN apt-get update && apt-get install -y \
python3-tk \
python3-matplotlib \
python3-scipy \
- python3-sphinx \
- texlive-latex-recommended
+ texlive-latex-recommended \
+ texlive-latex-extra \
+ dvipng
RUN pip3 install --upgrade pip
-RUN pip3 install scipy nose coverage pytest pytest-cov Sphinx sphinxcontrib-bibtex
+RUN pip3 install nose coverage pytest pytest-cov sphinx sphinxcontrib-bibtex
# Copy the ltfatpy sdist in the docker directory and uncomment the following line
# if you want to include ltfatpy sources in the docker image :
-# ADD ltfatpy-1.0.8.tar.gz /
+# ADD ../dist/ltfatpy-1.0.8.tar.gz /
# cleanup
RUN apt-get -qy autoremove
\ No newline at end of file
diff --git a/docker/Dockerfile_i686 b/docker/Dockerfile_i686
index f822a9c..f530325 100644
--- a/docker/Dockerfile_i686
+++ b/docker/Dockerfile_i686
@@ -10,15 +10,13 @@ RUN apt-get update && apt-get install -y \
python3-pip \
python3-tk \
python3-matplotlib \
- python3-scipy \
- python3-sphinx \
- texlive-latex-recommended
+ python3-scipy
RUN pip3 install --upgrade pip
-RUN pip3 install nose coverage pytest pytest-cov sphinxcontrib-bibtex
+RUN pip3 install nose coverage pytest pytest-cov
# Copy the ltfatpy sdist in the docker directory and uncomment the following line
# if you want to include ltfatpy sources in the docker image :
-# ADD ltfatpy-1.0.8.tar.gz /
+# ADD ../dist/ltfatpy-1.0.8.tar.gz /
# cleanup
RUN apt-get -qy autoremove
\ No newline at end of file
--
GitLab