Merge branch 'master' of gitlab.utu.fi:nicolas.pope/ftl

.gitlab-ci.yml

@@ -14,15 +14,14 @@ stages:
 #  paths:
 #    - build/
 
-docker:
+linux:
   stage: all
   tags:
-    - docker
-  image: ubuntu:18.04
-  before_script:
-    - export DEBIAN_FRONTEND=noninteractive
-    - apt-get update -qq && apt-get install -y -qq g++ cmake git
-    - apt-get install -y -qq libopencv-dev libgoogle-glog-dev liburiparser-dev libreadline-dev libmsgpack-dev uuid-dev libpcl-dev
+    - linux
+#  before_script:
+#    - export DEBIAN_FRONTEND=noninteractive
+#    - apt-get update -qq && apt-get install -y -qq g++ cmake git
+#    - apt-get install -y -qq libopencv-dev libgoogle-glog-dev liburiparser-dev libreadline-dev libmsgpack-dev uuid-dev libpcl-dev
   script:
     - mkdir build
     - cd build