diff --git a/src/3.8/Dockerfile b/src/3.8/Dockerfile index d33cd81..65351c5 100644 --- a/src/3.8/Dockerfile +++ b/src/3.8/Dockerfile @@ -123,7 +123,7 @@ RUN python3 -m pip install https://api.github.com/repos/nest/nestml/zipball/pull # python3 -m pip install nestml==8.0.0rc1 && \ -RUN python3 -m pip install nestml-server@git+https://github.com/babsey/nestml-server@v1.0-b1 && \ +RUN python3 -m pip install nestml-server@git+https://github.com/babsey/nestml-server@v1.0-b2 && \ python3 -m pip install --upgrade pygsl@git+https://github.com/pygsl/pygsl@v2.3.3 COPY entrypoint.sh /usr/local/bin/entrypoint.sh @@ -132,5 +132,5 @@ RUN chmod +x /usr/local/bin/entrypoint.sh COPY test-nest.sh /opt/test-nest.sh RUN chmod +x /opt/test-nest.sh -EXPOSE 8080 52425 54286 +EXPOSE 8080 52425 52426 54286 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] diff --git a/src/3.8/entrypoint.sh b/src/3.8/entrypoint.sh index 5b3df93..b27435e 100644 --- a/src/3.8/entrypoint.sh +++ b/src/3.8/entrypoint.sh @@ -11,11 +11,15 @@ nest --help export MUSIC_ROOT_DIR='$HOME/.cache/music.install' export MUSIC_ROOT=${MUSIC_ROOT_DIR} MUSIC_PATH=${MUSIC_ROOT_DIR} -export LD_LIBRARY_PATH=${MUSIC_PATH}/lib:$LD_LIBRARY_PATH export PATH=${MUSIC_PATH}/bin:$PATH export CPATH=${MUSIC_PATH}/include:$CPATH export PYTHONPATH=${MUSIC_PATH}/lib/python3.8/site-packages:$PYTHONPATH +export NESTML_MODULES_PATH=${NESTML_MODULES_PATH:-/tmp/nestmlmodules} + +# Set LD_LIBRARY_PATH for music and nestml modules +export LD_LIBRARY_PATH=${MUSIC_PATH}/lib:${NESTML_MODULES_PATH}:$LD_LIBRARY_PATH + MODE="${NEST_CONTAINER_MODE:-$1}" if [[ "${MODE}" = 'interactive' ]]; then read -p "Your python script: " name diff --git a/src/dev/Dockerfile b/src/dev/Dockerfile index c302eea..11f35f4 100644 --- a/src/dev/Dockerfile +++ b/src/dev/Dockerfile @@ -140,7 +140,7 @@ RUN python3 -m pip install --upgrade pip && \ python3 -m pip install nest-desktop --pre && \ python3 -m pip uninstall nestml -y && \ python3 -m pip install --upgrade https://github.com/nest/nestml/archive/refs/heads/master.zip && \ - python3 -m pip install nestml-server@git+https://github.com/babsey/nestml-server@v1.0-b1 + python3 -m pip install nestml-server@git+https://github.com/babsey/nestml-server@v1.0-b2 RUN python3 -m pip install --force-reinstall --upgrade scipy @@ -150,5 +150,5 @@ RUN chmod +x /usr/local/bin/entrypoint.sh COPY test-nest.sh /opt/test-nest.sh RUN chmod +x /opt/test-nest.sh -EXPOSE 8080 52425 54286 +EXPOSE 8080 52425 52426 54286 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] diff --git a/src/dev/entrypoint.sh b/src/dev/entrypoint.sh index 5b3df93..b27435e 100644 --- a/src/dev/entrypoint.sh +++ b/src/dev/entrypoint.sh @@ -11,11 +11,15 @@ nest --help export MUSIC_ROOT_DIR='$HOME/.cache/music.install' export MUSIC_ROOT=${MUSIC_ROOT_DIR} MUSIC_PATH=${MUSIC_ROOT_DIR} -export LD_LIBRARY_PATH=${MUSIC_PATH}/lib:$LD_LIBRARY_PATH export PATH=${MUSIC_PATH}/bin:$PATH export CPATH=${MUSIC_PATH}/include:$CPATH export PYTHONPATH=${MUSIC_PATH}/lib/python3.8/site-packages:$PYTHONPATH +export NESTML_MODULES_PATH=${NESTML_MODULES_PATH:-/tmp/nestmlmodules} + +# Set LD_LIBRARY_PATH for music and nestml modules +export LD_LIBRARY_PATH=${MUSIC_PATH}/lib:${NESTML_MODULES_PATH}:$LD_LIBRARY_PATH + MODE="${NEST_CONTAINER_MODE:-$1}" if [[ "${MODE}" = 'interactive' ]]; then read -p "Your python script: " name