Skip to content

Commit dcdd2de

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 807b178 + 1543f85 commit dcdd2de

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/3.8/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ ARG CXX_FLAGS="-pedantic -Wextra -Wno-unknown-pragmas -D_GLIBCXX_ASSERTIONS"
1010
ENV TERM=xterm \
1111
TZ=Europe/Berlin \
1212
DEBIAN_FRONTEND=noninteractive \
13-
PATH=/root/.local/bin:${PATH}
13+
PATH=/root/.local/bin:${PATH} \
14+
OMPI_ALLOW_RUN_AS_ROOT=1 \
15+
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
1416

1517
RUN apt-get update && apt-get install -y --no-install-recommends \
1618
automake \
@@ -113,7 +115,7 @@ RUN mkdir ${SRC_PATH}/nest-build && cd $_ && \
113115
-Dwith-openmp=ON \
114116
-Dwith-libneurosim=OFF \
115117
-Dwith-sionlib=OFF \
116-
-Dwith-music='$HOME/.cache/libneurosim.install' \
118+
-Dwith-music='$HOME/.cache/music.install' \
117119
-Dwith-hdf5=ON \
118120
${SRC_PATH}/nest-simulator-${NEST_VERSION} && \
119121
make && \

src/dev/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ ARG CXX_FLAGS="-pedantic -Wextra -Wno-unknown-pragmas -D_GLIBCXX_ASSERTIONS"
1010
ENV TERM=xterm \
1111
TZ=Europe/Berlin \
1212
DEBIAN_FRONTEND=noninteractive \
13-
PATH=/root/.local/bin:${PATH}
13+
PATH=/root/.local/bin:${PATH} \
14+
OMPI_ALLOW_RUN_AS_ROOT=1 \
15+
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
1416

1517
RUN apt-get update && apt-get install -y --no-install-recommends \
1618
automake \
@@ -117,7 +119,7 @@ RUN python3 -m pip install sphinx>=6.2.1 sphinx_rtd_theme sphinx_autobuild sphin
117119
-Dwith-openmp=ON \
118120
-Dwith-libneurosim=OFF \
119121
-Dwith-sionlib=OFF \
120-
-Dwith-music='$HOME/.cache/libneurosim.install' \
122+
-Dwith-music='$HOME/.cache/music.install' \
121123
-Dwith-hdf5=ON \
122124
${SRC_PATH}/nest-simulator-${NEST_VERSION} && \
123125
make && \

0 commit comments

Comments
 (0)