Merge pull request #205 from babsey/nest-server-env

Change env for NEST Server
nest · Sep 22, 2023 · 8495963 · 8495963
2 parents ac4375f + cfd1b1a
commit 8495963
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/3.6/Dockerfile b/src/3.6/Dockerfile
@@ -23,7 +23,7 @@ RUN mkdir nest-build && cd nest-build && \
           -Dwith-mpi=ON \
           -Dwith-openmp=ON \
           -Dwith-libneurosim=OFF \
-          -Dwith-music=/opt/music-install \ 
+          -Dwith-music=/opt/music-install \
           -Dwith-hdf5=ON \
           ${SRC_PATH}/nest-simulator-${NEST_VERSION} && \
     make -j $(nproc) && \
@@ -42,7 +42,7 @@ COPY --from=builder /opt/nest /opt/nest
 COPY --from=builder /opt/music-install /opt/music-install
 
 RUN python3 -m pip install --upgrade pip && \
-    python3 -m pip install nest-desktop --pre && \
+    python3 -m pip install nest-desktop && \
     python3 -m pip uninstall nestml -y && \
     python3 -m pip install https://github.com/nest/nestml/archive/refs/heads/master.zip --upgrade
 

diff --git a/src/3.6/entrypoint.sh b/src/3.6/entrypoint.sh
@@ -35,10 +35,15 @@ elif [[ "${MODE}" = 'nest-desktop' ]]; then
 
 elif [[ "${MODE}" = 'nest-server' ]]; then
     export NEST_SERVER_HOST="${NEST_SERVER_HOST:-0.0.0.0}"
-    export NEST_SERVER_MODULES="${NEST_SERVER_MODULES:-nest,numpy}"
     export NEST_SERVER_PORT="${NEST_SERVER_PORT:-52425}"
-    export NEST_SERVER_RESTRICTION_OFF="${NEST_SERVER_RESTRICTION_OFF:-1}"
     export NEST_SERVER_STDOUT="${NEST_SERVER_STDOUT:-1}"
+
+    export NEST_SERVER_ACCESS_TOKEN="${NEST_SERVER_ACCESS_TOKEN}"
+    export NEST_SERVER_CORS_ORIGINS="${NEST_SERVER_CORS_ORIGINS:-http://localhost:*}"
+    export NEST_SERVER_DISABLE_AUTH="${NEST_SERVER_DISABLE_AUTH:-1}"
+    export NEST_SERVER_DISABLE_RESTRICTION="${NEST_SERVER_DISABLE_RESTRICTION:-1}"
+    export NEST_SERVER_ENABLE_EXEC_CALL="${NEST_SERVER_ENABLE_EXEC_CALL:-1}"
+    export NEST_SERVER_MODULES="${NEST_SERVER_MODULES:-import nest; import numpy; import numpy as np}"
     exec nest-server start
 
 elif [[ "${MODE}" = 'nest-server-mpi' ]]; then

diff --git a/src/dev/entrypoint.sh b/src/dev/entrypoint.sh
@@ -35,10 +35,15 @@ elif [[ "${MODE}" = 'nest-desktop' ]]; then
 
 elif [[ "${MODE}" = 'nest-server' ]]; then
     export NEST_SERVER_HOST="${NEST_SERVER_HOST:-0.0.0.0}"
-    export NEST_SERVER_MODULES="${NEST_SERVER_MODULES:-nest,numpy}"
     export NEST_SERVER_PORT="${NEST_SERVER_PORT:-52425}"
-    export NEST_SERVER_RESTRICTION_OFF="${NEST_SERVER_RESTRICTION_OFF:-1}"
     export NEST_SERVER_STDOUT="${NEST_SERVER_STDOUT:-1}"
+
+    export NEST_SERVER_ACCESS_TOKEN="${NEST_SERVER_ACCESS_TOKEN}"
+    export NEST_SERVER_CORS_ORIGINS="${NEST_SERVER_CORS_ORIGINS:-http://localhost:*}"
+    export NEST_SERVER_DISABLE_AUTH="${NEST_SERVER_DISABLE_AUTH:-1}"
+    export NEST_SERVER_DISABLE_RESTRICTION="${NEST_SERVER_DISABLE_RESTRICTION:-1}"
+    export NEST_SERVER_ENABLE_EXEC_CALL="${NEST_SERVER_ENABLE_EXEC_CALL:-1}"
+    export NEST_SERVER_MODULES="${NEST_SERVER_MODULES:-import nest; import numpy; import numpy as np}"
     exec nest-server start
 
 elif [[ "${MODE}" = 'nest-server-mpi' ]]; then