Merge remote-tracking branch 'upstream/master'

steffengraber · Dec 12, 2024 · dcdd2de · dcdd2de
2 parents 807b178 + 1543f85
commit dcdd2de
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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 \
@@ -113,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 && \

diff --git 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 \
@@ -117,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 && \