Update GFortran in docker & guard use mpi

Author: zbeekman

.Dockerfiles/master-jupyter-inherit/Dockerfile

@@ -1,7 +1,7 @@
-FROM jupyter/minimal-notebook:f3652d3f58f2
+FROM jupyter/minimal-notebook:latest
 
 USER root
-ENV GCC_VERSION 7.3.0
+ENV GCC_VERSION 8.2.0
 
 RUN DEBIAN_FRONTEND=noninteractive transientBuildDeps="file" \
     && echo "NB_USER=${NB_USER}" \
@@ -16,14 +16,14 @@ RUN DEBIAN_FRONTEND=noninteractive transientBuildDeps="file" \
     && apt-get update -y \
     && apt-get install -y --no-install-recommends \
     build-essential \
-    gcc-7>=7.3.0 \
-    gfortran-7>=7.3.0 \
-    g++-7>=7.3.0 \
+    gcc-8>=8.2.0 \
+    gfortran-8>=8.2.0 \
+    g++-8>=8.2.0 \
     mpich>=3.2 \
     libmpich-dev>=3.2 \
     ${transientBuildDeps} \
-    && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-7 \
-    && update-alternatives --set gcc "/usr/bin/gcc-7" \
+    && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-8 \
+    && update-alternatives --set gcc "/usr/bin/gcc-8" \
     && gcc --version \
     && gfortran --version \
     && mpiexec --version \
@@ -74,4 +74,4 @@ RUN DEBIAN_FRONTEND=noninteractive transientBuildDeps="cmake cmake-data git" \
     && apt-get purge -y --auto-remove ${transientBuildDeps} \
     && rm -rf /var/lib/apt/lists/* /var/log/* /tmp/*
 
-USER "${NB_USER}"
+USER "${NB_USER}"

src/tests/unit/teams/get-communicator.f90

@@ -34,6 +34,10 @@ program main
 
   implicit none
 
+#ifndef MPI_WORKING_MODULE
+  include 'mpif.h'
+#endif
+
   call mpi_matches_caf(get_communicator())
     !! verify # ranks = # images and image number = rank + 1
 
@@ -83,8 +87,10 @@ pure function destination_team(image,numTeams) result(team)
      team = mod(image+1,numTeams)+1
    end function
 
-  subroutine mpi_matches_caf(comm)
+subroutine mpi_matches_caf(comm)
+#ifdef MPI_WORKING_MODULE
     use mpi
+#endif
     use iso_c_binding, only : c_int
     integer(c_int), intent(in) :: comm
       !! MPI communicator