Fix nest-server, nest-desktop and compose file (#223)

* Merge build and deploy to fix deploy problems

* Add nest-server requirements

* Fix nest-desktop and compose file

Author: steffengraber

docker-compose.yml

@@ -2,15 +2,15 @@ version: "3"
 
 services:
   nest-server:
-    image: nest/nest-simulator:3.6
+    image: nest/nest-simulator:3.7rc1
     environment:
       LOCAL_USER_ID: "`id -u $USER`"
       NEST_CONTAINER_MODE: "nest-server"
     ports:
       - "52425:52425"
 
   nest-desktop:
-    image: nest/nest-simulator:3.6
+    image: nest/nest-simulator:3.7rc1
     environment:
       LOCAL_USER_ID: "`id -u $USER`"
       NEST_CONTAINER_MODE: "nest-desktop"
@@ -20,7 +20,7 @@ services:
       - nest-server
 
   nest-notebook:
-    image: nest/nest-simulator:3.6
+    image: nest/nest-simulator:3.7rc1
     volumes:
       - .:/opt/data
     environment:
@@ -30,7 +30,7 @@ services:
       - "8080:8080"
 
   nest-jupyterlab:
-    image: nest/nest-simulator:3.6
+    image: nest/nest-simulator:3.7rc1
     volumes:
       - .:/opt/data
     environment:

src/3.7rc1/Dockerfile

@@ -117,7 +117,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     python3 -m pip install --upgrade pip && \
     python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/requirements_testing.txt && \
     python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/requirements_nest_server.txt && \
-    python3 -m pip install nest-desktop --pre && \
+    python3 -m pip install nest-desktop && \
     python3 -m pip uninstall nestml -y && \
     python3 -m pip install --upgrade https://github.com/nest/nestml/archive/refs/tags/v7.0.1-rc1.zip  && \
     python3 -m pip install --force-reinstall --upgrade scipy