workflows: Edit petsc docker image

Author: ZoeLeibowitz

.github/workflows/pytest-petsc.yml

@@ -56,10 +56,6 @@ jobs:
       run: |
           docker build -f docker/Dockerfile.devito --build-arg base=zoeleibowitz/petsc_image:latest --tag zoeleibowitz/petsc_devito_image:latest .
 
-    - name: Push Docker image to DockerHub
-      run: |
-          docker push ${{ secrets.DOCKER_USERNAME }}/petsc_devito_image:latest
-
     - name: Set run prefix
       run: |
           echo "RUN_CMD=docker run --rm -t -e CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }} --name testrun zoeleibowitz/petsc_devito_image:latest"  >> $GITHUB_ENV

docker/Dockerfile.cpu

@@ -17,8 +17,7 @@ RUN apt-get update && \
 
 # Install for basic base not containing it
 RUN apt-get install -y wget flex libnuma-dev hwloc curl cmake git \
-        autoconf libtool build-essential procps software-properties-common \
-        gfortran pkgconf libopenblas-serial-dev
+        autoconf libtool build-essential procps software-properties-common
 
 # Install gcc
 RUN if [ -n "$gcc" ]; then \
@@ -44,6 +43,7 @@ RUN cd /tmp && mkdir openmpi && \
     cd openmpi && ./autogen.pl && \
     mkdir build &&  cd build && \
     ../configure --prefix=/opt/openmpi/ \
+                 --disable-mpi-fortran \
                  --enable-mca-no-build=btl-uct --enable-mpi1-compatibility && \
     make -j ${nproc} && \
     make install && \

docker/Dockerfile.petsc

@@ -7,7 +7,10 @@
 # use the one from my dockerhub
 ARG base=zoeleibowitz/bases:cpu-gcc
 
-RUN apt-get update && apt-get install -y git && \
+FROM $base
+
+RUN apt-get update && apt-get install -y \
+    git gfortran pkgconf libopenblas-serial-dev && \
     python3 -m venv /venv && \
     /venv/bin/pip install --no-cache-dir --upgrade pip && \
     /venv/bin/pip install --no-cache-dir --no-binary numpy numpy && \