Use ubuntu in CI

Signed-off-by: schroedtert <t.schroedter@fz-juelich.de>

.gitlab-ci.yml

@@ -36,10 +36,10 @@ build_container:
     entrypoint: [""]
   script:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/container/arch/Dockerfile --destination $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}_linux
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/container/ubuntu/Dockerfile --destination $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_SLUG}_linux
   rules:
     - changes:
-        - container/arch/Dockerfile
+        - container/ubuntu/Dockerfile
 
 # Build petrack and petrack unit_tests
 build_linux:
@@ -75,7 +75,7 @@ regression_test_linux:
   stage: test
   script:
     - cd tests/regression_test/tests
-    - python -m pytest --path=../../../build/petrack --junitxml=pytest_report.xml >> "RegressionTestLog.txt"
+    - python3 -m pytest --path=../../../build/petrack --junitxml=pytest_report.xml >> "RegressionTestLog.txt"
   artifacts:
     when: on_failure
     paths:

container/arch/Dockerfile → container/ubuntu/Dockerfile

-FROM archlinux:20200705
+FROM ubuntu:20.10
 
 # Update the repositories
-RUN pacman -Syy
+RUN apt-get update && apt-get install -y software-properties-common
 
 # Install the needed tools
-RUN pacman -Syu --needed --noconfirm \
-	git \
-	gcc \
-	cmake \
-	make \
-	base-devel \
-	ninja
+RUN apt-get update && apt-get install -y wget \
+                       git \
+                       g++ \
+                       make \
+                       ninja-build \
+                       cmake
 
 # Install the needed libraries
-RUN pacman -Syu --needed --noconfirm \
-	qt5-base \
-	qwt \
+RUN apt-get update && apt-get install -y \
+	qt5-default \
+	libqwt-qt5-dev \
+	libopencv-dev \
+	libopencv-contrib4.2 \
 	catch2
 
 # Install python
-RUN pacman -Syu --needed --noconfirm \
-    python \
-    python-pip
+RUN apt-get update && apt-get install -y \
+    python3 \
+    python3-pip
 RUN pip install pytest
 
 # Install trompeloeil from source (not in package manager)
@@ -35,12 +36,3 @@ RUN mkdir deps && \
     cd build && \
     cmake .. && \
     cmake --build . --target install
-
-# Install opencv 4.2 (last command to avoid any updates by pacman)
-RUN pacman --needed --noconfirm -U \
-    https://archive.archlinux.org/packages/h/hdf5/hdf5-1.10.5-1-x86_64.pkg.tar.xz \
-    https://archive.archlinux.org/packages/v/vtk/vtk-8.2.0-9-x86_64.pkg.tar.xz \
-    https://archive.archlinux.org/packages/g/glew/glew-2.1.0-1-x86_64.pkg.tar.xz \
-    https://archive.archlinux.org/packages/o/openexr/openexr-2.4.0-6-x86_64.pkg.tar.xz \
-    https://archive.archlinux.org/packages/o/opencv/opencv-4.2.0-1-x86_64.pkg.tar.xz
-