From 5e8c602c8d1c311431c4e0b444128b84a7566c36 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Tue, 21 Aug 2018 12:39:39 +0200
Subject: [PATCH] ci: use Centos 7 based Docker Image with CUDA dev env from
 Nvidia

---
 fpga/.gitlab-ci.yml |  6 +++---
 fpga/Dockerfile     | 21 ++++++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/fpga/.gitlab-ci.yml b/fpga/.gitlab-ci.yml
index ab5b0d02e..6500d9562 100644
--- a/fpga/.gitlab-ci.yml
+++ b/fpga/.gitlab-ci.yml
@@ -33,7 +33,7 @@ docker-dev:
 build:source:
   stage: build
   script:
-    - mkdir build && cd build && cmake .. && make -j8
+    - mkdir build && cd build && cmake3 .. && make -j8
   artifacts:
     expire_in: 1 week
     name: ${CI_PROJECT_NAME}-${CI_BUILD_REF}
@@ -46,7 +46,7 @@ build:source:
 #build:packages:
 #  stage: build
 #  script:
-#    - mkdir build && cd build && cmake .. && make package
+#    - mkdir build && cd build && cmake3 .. && make package
 #  artifacts:
 #    expire_in: 1 week
 #    name: ${CI_PROJECT_NAME}-${CI_BUILD_REF}
@@ -76,7 +76,7 @@ test:unit-hardware:
   tags:
     - villas-fpga
   script: |
-    rm -r build && mkdir build && cd build && cmake .. && make unit-tests -j8
+    rm -r build && mkdir build && cd build && cmake3 .. && make unit-tests -j8
     if [ "$(who | wc -l)" -eq "0" ]; then
       tests/unit-tests --jobs 1 --filter 'fpga/*'
     else
diff --git a/fpga/Dockerfile b/fpga/Dockerfile
index 8ccf14fe5..4b8dfbc06 100644
--- a/fpga/Dockerfile
+++ b/fpga/Dockerfile
@@ -28,7 +28,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###################################################################################
 
-FROM fedora:28
+FROM nvidia/cuda:9.2-devel-centos7
 
 LABEL \
 	org.label-schema.schema-version="1.0" \
@@ -42,22 +42,25 @@ LABEL \
 	org.label-schema.vcs-url="https://git.rwth-aachen.de/VILLASframework/VILLASfpga" \
 	org.label-schema.usage="https://villas.fein-aachen.org/doc/fpga.html"
 
+# Some of the dependencies are only available in our own repo
+ADD https://villas.fein-aachen.org/packages/villas.repo /etc/yum.repos.d/
+
+# Enable Extra Packages for Enterprise Linux (EPEL) and Software collection repo
+RUN yum -y install epel-release centos-release-scl
+
 # Toolchain
-RUN dnf -y install \
+RUN yum -y install \
 	gcc gcc-c++ \
-	pkgconfig make cmake \
+	pkgconfig make cmake3 \
 	autoconf automake autogen libtool \
 	texinfo git curl tar
 
 # Several tools only needed for developement and testing
-RUN dnf -y install \
+RUN yum -y install \
 	rpmdevtools rpm-build
 
-# Some of the dependencies are only available in our own repo
-ADD https://villas.fein-aachen.org/packages/villas.repo /etc/yum.repos.d/
-
 # Dependencies
-RUN dnf -y install \
+RUN yum -y install \
 	jansson-devel \
 	libxil-devel \
 	lapack-devel
@@ -68,5 +71,5 @@ RUN mkdir -p /tmp/criterion/build && cd /tmp/criterion/build && cmake .. && make
 
 ENV LD_LIBRARY_PATH /usr/local/lib:/usr/local/lib64
 
-WORKDIR /villas
+WORKDIR /fpga
 ENTRYPOINT bash