From 89d60051bd10b1c8ce07f7113dfdea40753cc14b Mon Sep 17 00:00:00 2001
From: Steffen Graber <s.graber@fz-juelich.de>
Date: Thu, 12 Dec 2024 13:41:19 +0100
Subject: [PATCH 1/3] Fix use of mpirun as root (#252)

* Fix use mpirun as root in container
---
 src/3.8/Dockerfile | 4 +++-
 src/dev/Dockerfile | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/3.8/Dockerfile b/src/3.8/Dockerfile
index 29fc7a3..8427e77 100644
--- a/src/3.8/Dockerfile
+++ b/src/3.8/Dockerfile
@@ -10,7 +10,9 @@ ARG CXX_FLAGS="-pedantic -Wextra -Wno-unknown-pragmas -D_GLIBCXX_ASSERTIONS"
 ENV TERM=xterm \
     TZ=Europe/Berlin \
     DEBIAN_FRONTEND=noninteractive \
-    PATH=/root/.local/bin:${PATH}
+    PATH=/root/.local/bin:${PATH} \
+    OMPI_ALLOW_RUN_AS_ROOT=1 \
+    OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     automake \
diff --git a/src/dev/Dockerfile b/src/dev/Dockerfile
index 4d970f8..c12622e 100644
--- a/src/dev/Dockerfile
+++ b/src/dev/Dockerfile
@@ -10,7 +10,9 @@ ARG CXX_FLAGS="-pedantic -Wextra -Wno-unknown-pragmas -D_GLIBCXX_ASSERTIONS"
 ENV TERM=xterm \
     TZ=Europe/Berlin \
     DEBIAN_FRONTEND=noninteractive \
-    PATH=/root/.local/bin:${PATH}
+    PATH=/root/.local/bin:${PATH} \
+    OMPI_ALLOW_RUN_AS_ROOT=1 \
+    OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
 
     RUN apt-get update && apt-get install -y --no-install-recommends \
     automake \

From cebaa97e1df2a333130187959994173d1e37af86 Mon Sep 17 00:00:00 2001
From: Steffen Graber <s.graber@fz-juelich.de>
Date: Thu, 12 Dec 2024 15:33:28 +0100
Subject: [PATCH 2/3] Fix path to music

---
 src/3.8/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3.8/Dockerfile b/src/3.8/Dockerfile
index 8427e77..4e31a8e 100644
--- a/src/3.8/Dockerfile
+++ b/src/3.8/Dockerfile
@@ -115,7 +115,7 @@ RUN mkdir ${SRC_PATH}/nest-build && cd $_ && \
           -Dwith-openmp=ON \
           -Dwith-libneurosim=OFF \
           -Dwith-sionlib=OFF \
-          -Dwith-music='$HOME/.cache/libneurosim.install' \
+          -Dwith-music='$HOME/.cache/music.install' \
           -Dwith-hdf5=ON \
           ${SRC_PATH}/nest-simulator-${NEST_VERSION} && \
           make && \

From 1543f850042205bd6084c642bcb7cc619bcc090d Mon Sep 17 00:00:00 2001
From: Steffen Graber <s.graber@fz-juelich.de>
Date: Thu, 12 Dec 2024 15:34:25 +0100
Subject: [PATCH 3/3] Fix path to musc

---
 src/dev/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dev/Dockerfile b/src/dev/Dockerfile
index c12622e..9c64e34 100644
--- a/src/dev/Dockerfile
+++ b/src/dev/Dockerfile
@@ -119,7 +119,7 @@ RUN python3 -m pip install sphinx>=6.2.1 sphinx_rtd_theme sphinx_autobuild sphin
           -Dwith-openmp=ON \
           -Dwith-libneurosim=OFF \
           -Dwith-sionlib=OFF \
-          -Dwith-music='$HOME/.cache/libneurosim.install' \
+          -Dwith-music='$HOME/.cache/music.install' \
           -Dwith-hdf5=ON \
           ${SRC_PATH}/nest-simulator-${NEST_VERSION} && \
           make && \