Merge pull request #3221 from boutproject/fix3121

Fix container build

Author: ZedThree

.docker/fedora/Dockerfile

@@ -22,18 +22,25 @@ RUN git clone $URL \
  && git checkout $COMMIT \
  && git submodule update --init --recursive
 
-
+ENV HOME=/home/boutuser
 WORKDIR /home/boutuser/BOUT-dev
 
-RUN cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/opt/bout++/ \
+RUN cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/usr/local/ \
           -DBOUT_GENERATE_FIELDOPS=OFF \
-          -DBOUT_USE_PETSC=ON -DPETSc_ROOT=/opt/petsc \
+          -DBOUT_USE_PETSC=ON -DPETSc_ROOT=/usr/local \
           -DBOUT_ENABLE_PYTHON=ON \
           -DBOUT_USE_SUNDIALS=ON -DSUNDIALS_ROOT=/usr/lib64/$MPI/ -DSUNDIALS_INCLUDE_DIR=/usr/include/$MPI-x86_64/sundials/ \
-	  $CMAKE_OPTIONS || (cat /home/boutuser/BOUT-dev/build/CMakeFiles/CMake{Output,Error}.log  ; exit 1)
+	  $CMAKE_OPTIONS || (cat /home/boutuser/BOUT-dev/build/CMakeFiles/CMake{Output,Error}.log  ; exit 1); \
+    make -C build -j 2; \
+    sudo make -C build install; \
+    rm -rf build
 
+# Add unversioned path for python
+RUN sudo ln -s /usr/local/lib/python3.* /usr/local/lib/python3.x
 
-RUN make -C build -j 2
-RUN sudo make -C build install
+ENV PATH=/usr/local/bin:$PATH \
+    LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH \
+    PYTHONPATH=/usr/local/lib/python3.x/site-packages/:$PYTHONPATH
 
-RUN find /opt/bout++
+# smoke test
+RUN python3 -c 'import boutpp'

.github/workflows/docker.yml

@@ -6,7 +6,7 @@ on:
       - master
       - next
       # Add your branch here if you want containers for it
-      - db-WIP
+      - fix3121
       - docker-ci
 
 env: