From fb03ba2c6b59aff202d2b15d6667e4c1a0331fdf Mon Sep 17 00:00:00 2001
From: Denis Arrivault <denis.arrivault@lif.univ-mrs.fr>
Date: Fri, 28 Apr 2017 14:03:42 +0200
Subject: [PATCH] Update Dockerfiles + launch doc generation on regular runner

---
 .gitlab-ci.yml                         | 24 ++++++++++++------------
 docker/Dockerfile_X86_64               | 21 +++++++++++++++++++++
 docker/Dockerfile_cython               | 16 ----------------
 docker/Dockerfile_cython_X86_64        | 22 ++++++++++++++++++++++
 docker/{Dockerfile => Dockerfile_i686} | 11 +++++++----
 5 files changed, 62 insertions(+), 32 deletions(-)
 create mode 100644 docker/Dockerfile_X86_64
 delete mode 100644 docker/Dockerfile_cython
 create mode 100644 docker/Dockerfile_cython_X86_64
 rename docker/{Dockerfile => Dockerfile_i686} (50%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f38008..0b50e96 100644
--- a/.gitlab-ci.yml
+++ b/.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: 
diff --git a/docker/Dockerfile_X86_64 b/docker/Dockerfile_X86_64
new file mode 100644
index 0000000..e3676f6
--- /dev/null
+++ b/docker/Dockerfile_X86_64
@@ -0,0 +1,21 @@
+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
diff --git a/docker/Dockerfile_cython b/docker/Dockerfile_cython
deleted file mode 100644
index e21ee35..0000000
--- a/docker/Dockerfile_cython
+++ /dev/null
@@ -1,16 +0,0 @@
-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 \
-    cython \
-    python3-tk
-RUN pip3 install --upgrade pip
-RUN pip3 install scipy matplotlib nose coverage pytest pytest-cov Sphinx sphinxcontrib-bibtex
-# cleanup
-RUN apt-get -qy autoremove
\ No newline at end of file
diff --git a/docker/Dockerfile_cython_X86_64 b/docker/Dockerfile_cython_X86_64
new file mode 100644
index 0000000..65ff8dc
--- /dev/null
+++ b/docker/Dockerfile_cython_X86_64
@@ -0,0 +1,22 @@
+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 \
+    cython \
+    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
diff --git a/docker/Dockerfile b/docker/Dockerfile_i686
similarity index 50%
rename from docker/Dockerfile
rename to docker/Dockerfile_i686
index 86f34ba..4aabd0f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile_i686
@@ -1,4 +1,3 @@
-#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
-- 
GitLab