Merge branch 'fix_unstable' into 'main'

Fix unstable

Closes #105

See merge request !131

.gitlab-ci.yml

@@ -53,7 +53,7 @@ debian_unstable_ci:
   stage: dev
   allow_failure: true
   variables:
-    SUBDIR: debian_ci
+    SUBDIR: debian_unstable_ci
   extends: [.docker-in-docker, .subdir]
 
 manylinux:

debian/common_context/entrypoint.sh

@@ -45,6 +45,7 @@ export ALLINEA_LICENCE_FILE=/home/$USERNAME_/.config/allinea/Licence \
 
 # give the user some sudo capabilities
 if [[ $UID_ != 0 ]] ; then
+  echo "$USERNAME_ ALL=(ALL) NOPASSWD:/usr/bin/aptitude" >> /etc/sudoers
   echo "$USERNAME_ ALL=(ALL) NOPASSWD:/usr/bin/apt-get" >> /etc/sudoers
   echo "$USERNAME_ ALL=(ALL) NOPASSWD:/usr/bin/apt" >> /etc/sudoers
   echo "$USERNAME_ ALL=(ALL) NOPASSWD:/usr/bin/dpkg" >> /etc/sudoers

debian/include/qtcreator

-ENV QTC_VERSION=4.2.2
 RUN APT_UPDATE && \
-    apt-get dist-upgrade -qqy --no-install-recommends APT_REDIRECT && \
-    APT_INSTALL git-gui gitk paraview libgmsh-dev && \
-    cd /tmp && \
-    wget http://ftp.fau.de/qtproject/archive/qtcreator/4.2/${QTC_VERSION}/qt-creator-opensource-linux-x86_64-${QTC_VERSION}.run && \
-    wget https://raw.githubusercontent.com/benlau/qtci/master/bin/extract-qt-installer && \
-    chmod 755 extract-qt-installer && \
-    ./extract-qt-installer qt-creator-opensource-linux-x86_64-${QTC_VERSION}.run /usr/local/ && \
-    rm extract-qt-installer qt-creator-opensource-linux-x86_64-${QTC_VERSION}.run
+    APT_INSTALL qtcreator && \
+    rm -rf /var/lib/apt/lists/*
\ No newline at end of file

debian/include/stable-minimal

@@ -14,6 +14,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
 
 # bullseye-backports are enabled for manual installs
 # locale is mainly required for the interactive session
+# libdw1 is required for qtcreator
 RUN APT_UPDATE APT_REDIRECT && \
     apt-get upgrade -qqy --no-install-recommends APT_REDIRECT && \
     echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \
@@ -24,8 +25,8 @@ RUN APT_UPDATE APT_REDIRECT && \
     echo "deb http://deb.debian.org/debian bullseye-backports main contrib non-free" > /etc/apt/sources.list.d/bullseye-backports.list && \
     echo "deb http://deb.debian.org/debian/ stable contrib non-free" > /etc/apt/sources.list.d/stable-nonfree.list && \
     APT_UPDATE APT_REDIRECT && \
-    APT_INSTALL -t bullseye-backports libglvnd0 && \
-    APT_INSTALL automake bison build-essential cmake flex gfortran git libboost-system-dev \
+    APT_INSTALL -t bullseye-backports libglvnd0 libdw1 && \
+    APT_INSTALL automake ninja-build bison build-essential cmake flex gfortran git libboost-system-dev \
                 libboost-thread-dev libboost-filesystem-dev libboost-date-time-dev \
                 libboost-timer-dev libboost-chrono-dev libsuperlu-dev libtool \
                 pkg-config python3 python3-dbg python3-dev libgraphviz-dev python3-tk \

debian/include/unstable-minimal

@@ -18,7 +18,7 @@ RUN APT_UPDATE APT_REDIRECT && \
     echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \
     echo "de_DE.UTF-8 UTF-8" >> /etc/locale.gen && \
     APT_UPDATE APT_REDIRECT && \
-    APT_INSTALL automake bison build-essential cmake flex gfortran git libboost-system-dev \
+    APT_INSTALL automake bison ninja-build build-essential cmake flex gfortran git libboost-system-dev \
                 locales libboost-thread-dev libboost-filesystem-dev libboost-date-time-dev \
                 libboost-timer-dev libboost-chrono-dev libsuperlu-dev libtool libglvnd0 \
                 pkg-config python3 python3-dbg python3-dev libgraphviz-dev python3-tk \

include/tbb_from_source

 RUN git clone --depth=1 https://github.com/wjakob/tbb /tmp/tbb && \
   mkdir /tmp/tbb_build && cd /tmp/tbb_build && \
-  cmake /tmp/tbb -DTBB_BUILD_PYTHON=ON -DTBB_NO_DATE=ON -DCMAKE_INSTALL_PREFIX=/usr/local && \
-  make && \
-  make install && \
+  cmake -GNinja /tmp/tbb -DTBB_BUILD_PYTHON=ON -DTBB_NO_DATE=ON -DCMAKE_INSTALL_PREFIX=/usr/local && \
+  ninja -j $(nproc --ignore=1) -l $(nproc --ignore=2) && \
+  ninja install && \
   rm -rf /tmp/*

manylinux/include/wheelbuilder_2014

-FROM quay.io/pypa/manylinux2014_x86_64:2021-05-30-d4af1a5
-
-MAINTAINER René Fritze <rene.fritze@wwu.de>
-
-COPY pybin.sh /usr/local/bin/
-RUN yum install -y atlas-devel openmpi-devel  \
-        fltk freeglut libpng libjpeg \
-        tk tcl xorg-x11-server-Xvfb xauth \
-        boost169 boost169-openmpi-devel cmake3 eigen3-devel SuperLU-devel \
-        tbb-devel openblas-openmp64 cmake3-gui vim ccache lapack-devel suitesparse
-
-include(ps1)
-include(dune_cli)
-
-ENV MPICC=/usr/lib64/openmpi/bin/mpicc \
-    PYTHON_VERSION=M4_PYTHON_VERSION \
-    XDG_CACHE_DIR=/home/dxt/src/docker/cache \
-    DUNE_INSTALL_PREFIX=/home/dxt/src/docker/local \
-    DUNE_BUILD_DIR=/home/dxt/src/docker/build \
-    WHEEL_DIR=/home/dxt/src/docker/wheelhouse \
-    PLATFORM=manylinux2014_x86_64 \
-    PY_SHORT=M4_PY_SHORT \
-    PIP_VERSION=21.1.3
-
-RUN echo "alias ls='ls -h --color=auto';\
-          source /usr/local/bin/pybin.sh;\
-          source /etc/bash.bashrc;\
-          alias ll='ls -lh'" >> /etc/profile.d/dxt.sh && \
-    echo "source  /etc/profile.d/dxt.sh" >> /etc/bashrc && \
-    echo "source  /etc/profile.d/dxt.sh" >> /etc/profile && \
-  alternatives --install /usr/bin/python python /opt/python/${PY_SHORT}/bin/python 100 && \
-  alternatives --install /usr/bin/python3 python3 /opt/python/${PY_SHORT}/bin/python 100 &&\
-  python -m pip install wheel auditwheel ninja && \
-  python -m pip install pip==${PIP_VERSION}
-
-# yum is python2 but we changed the dafault above
-RUN for ii in /usr/libexec/urlgrabber-ext-down /usr/bin/yum*; do sed -i 's/python/python2/' $ii; done
-
-COPY entrypoint.sh /usr/local/bin/
-COPY gosu-amd64 /usr/local/bin/gosu
-COPY build-wheels.sh /usr/local/bin/
-
-RUN chmod +x /usr/local/bin/*
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-CMD ["/usr/local/bin/build-wheels.sh"]
-VOLUME ["/home/dxt/src"]