Update Dockerfiles + launch doc generation on regular runner

.gitlab-ci.yml

@@ -5,24 +5,24 @@ stages:
   - doc
 
 # Global runner/docker image definition
-image: registry.gitlab.lif.univ-mrs.fr:5005/dev/ltfatpy/ltfatpy_ubuntu_16.04
+image: ubuntu:latest
 
 # Global caching 
-#cache:
-#  key: "cache"
-#  paths:
+cache:
+  key: "cache"
+  paths:
 # apt
-#    - apt-cache
+    - apt-cache
 # build
-#    - build
+    - build
   
 #before_script:
-#  - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-#  - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake libfftw3-dev
-#  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y liblapack-dev python3.5 python3.5-dev python3-pip python3-tk
-#  - pip3 install --upgrade pip
-#  - pip3 install scipy matplotlib nose coverage cython
-#  - pip3 list
+  - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
+  - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake libfftw3-dev liblapack-dev
+  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y python3.5 python3.5-dev python3-pip python3-tk
+  - pip3 install --upgrade pip
+  - pip3 install scipy matplotlib nose coverage cython
+  - pip3 list
 
 # Main build 
 build: 

docker/Dockerfile_X86_64

+FROM ubuntu:latest
+MAINTAINER Denis Arrivault
+WORKDIR /
+RUN apt-get update && apt-get install -y \
+    cmake \
+    libfftw3-dev \
+    liblapack-dev \
+    python3 \
+    python3-dev \
+    python3-pip \
+    python3-tk \
+    python3-matplotlib
+RUN pip3 install --upgrade pip
+RUN pip3 install scipy 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 /
+
+# cleanup
+RUN apt-get -qy autoremove
\ No newline at end of file

docker/Dockerfile_cython → docker/Dockerfile_cython_X86_64

@@ -9,8 +9,14 @@ RUN apt-get update && apt-get install -y \
     python3-dev \
     python3-pip \
     cython \
-    python3-tk
+    python3-tk \
+    python3-matplotlib
 RUN pip3 install --upgrade pip
-RUN pip3 install scipy matplotlib nose coverage pytest pytest-cov Sphinx sphinxcontrib-bibtex
+RUN pip3 install scipy 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 /
+
 # cleanup
 RUN apt-get -qy autoremove
\ No newline at end of file

docker/Dockerfile → docker/Dockerfile_i686

-#FROM ubuntu:latest
 FROM ioft/i386-ubuntu
 MAINTAINER Denis Arrivault
 WORKDIR /
@@ -10,9 +9,13 @@ RUN apt-get update && apt-get install -y \
     python3-dev \
     python3-pip \
     python3-tk \
-    libfreetype6
+    python3-matplotlib
 RUN pip3 install --upgrade pip
-RUN pip3 install scipy matplotlib nose coverage pytest pytest-cov Sphinx sphinxcontrib-bibtex
-ADD ltfatpy-1.0.8 /
+RUN pip3 install scipy 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 /
+
 # cleanup
 RUN apt-get -qy autoremove
\ No newline at end of file