Merge branch 'bitpit-1.7.1' into 'master'

bump to Bitpit 1.7.1

See merge request memphis/neos!1

.gitlab-ci.yml

@@ -127,7 +127,7 @@ docker-base:
     - dind
   script:
     - docker pull               $IMAGE:latest || true
-    - docker build --cache-from $IMAGE:latest --tag $IMAGE:$CI_COMMIT_SHA --tag $IMAGE:latest . -f docker/Dockerfile-base
+    - docker build              --tag $IMAGE:$CI_COMMIT_SHA --tag $IMAGE:latest . -f docker/Dockerfile-base
     - docker push               $IMAGE:$CI_COMMIT_SHA
     - docker push               $IMAGE:latest
 
@@ -137,20 +137,32 @@ docker-neos-master:
   variables:
     IMAGE: $CI_REGISTRY_IMAGE
     IMAGE_BASE: $CI_REGISTRY_IMAGE/base
+    IMAGE_TAG: latest
   only:
     - master
   extends: .docker-neos
 
-docker-neos:
+docker-neos-branch:
   stage: docker-neos
   when: manual
   variables:
-    IMAGE: $CI_REGISTRY_IMAGE/$CI_COMMIT_BRANCH
+    IMAGE: $CI_REGISTRY_IMAGE
     IMAGE_BASE: $CI_REGISTRY_IMAGE/base/$CI_COMMIT_BRANCH
-  except:
-    - master
+    IMAGE_TAG: $CI_COMMIT_BRANCH
+  only:
+    - branches
   extends: .docker-neos
 
+docker-neos-tags:
+  stage: docker-neos
+  when: manual
+  variables:
+    IMAGE: $CI_REGISTRY_IMAGE
+    IMAGE_BASE: $CI_REGISTRY_IMAGE/base
+    IMAGE_TAG: $CI_COMMIT_TAG
+  only:
+    - tags
+  extends: .docker-neos
 
 .docker-neos:
   image: "buildah/buildah"
@@ -162,10 +174,9 @@ docker-neos:
   tags:
     - dind
   script:
-    - docker pull               $IMAGE:latest || true
-    - docker build --cache-from $IMAGE:latest --tag $IMAGE:$CI_COMMIT_SHA --tag $IMAGE:latest --build-arg IMAGE_BASE=$IMAGE_BASE . -f docker/Dockerfile
-    - docker push               $IMAGE:$CI_COMMIT_SHA
-    - docker push               $IMAGE:latest
+    - docker pull               $IMAGE:$IMAGE_TAG || true
+    - docker build              --tag $IMAGE:$IMAGE_TAG --build-arg IMAGE_BASE=$IMAGE_BASE . -f docker/Dockerfile
+    - docker push               $IMAGE:$IMAGE_TAG
 
 docker-notebook:
   stage: docker-notebook

docker/Dockerfile-base

@@ -37,21 +37,19 @@ RUN cd /usr/local/ && \
     wget -q http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.13.1.tar.gz && \
     tar xf petsc-lite-3.13.1.tar.gz && \
     cd petsc-3.13.1/ && \
-    ./configure --with-cc=mpicc --with-fc=mpif90 --with-cxx=mpicxx  && \
+    ./configure --with-cc=mpicc --with-fc=mpif90 --with-cxx=mpicxx --prefix=/usr/local/petsc && \
     make -j 4 PETSC_DIR=/usr/local/petsc-3.13.1 PETSC_ARCH=arch-linux-c-debug all && \
-    echo "export PETSC_DIR=/usr/local/petsc-3.13.1" >> /home/gitlab/.bashrc && \
-    echo "export PETSC_ARCH=arch-linux-c-debug" >> /home/gitlab/.bashrc && \
+    make install && \
     cd .. && \
     rm petsc-lite-3.13.1.tar.gz
 
-ENV PKG_CONFIG_PATH=/usr/local/petsc-3.13.1/arch-linux-c-debug/lib/pkgconfig \
-    PETSC_DIR=/usr/local/petsc-3.13.1 \
-    PETSC_ARCH=arch-linux-c-debug
+ENV PETSC_DIR=/usr/local/petsc \
+    PETSC_ARCH=""
 
 RUN cd /tmp/ && \
-    wget -q https://github.com/optimad/bitpit/archive/bitpit-1.7.0.tar.gz && \
-    tar xf bitpit-1.7.0.tar.gz && \
-    cd bitpit-bitpit-1.7.0/ && \
+    wget -q https://github.com/optimad/bitpit/archive/bitpit-1.7.1.tar.gz && \
+    tar xf bitpit-1.7.1.tar.gz && \
+    cd bitpit-bitpit-1.7.1/ && \
     cmake . -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_MPI=ON && \
     make -j 4 && \
     make install && \