Add NEST v3.8_rc1 (#234)

* Merge build and deploy to fix deploy problems * Add nest-server requirements * Fix nest-desktop and compose file * Add v3.7 * Remove test * Add v3.7 to readme * Fix nestml version and add pygsl * Add NEST v3.8 * Deactivate Base images, not needed since 3.7 * Deploy rc1 version
nest · Jul 16, 2024 · 55a972c · 55a972c
1 parent 3a9d430
commit 55a972c
Show file tree

Hide file tree

Showing 12 changed files with 263 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -16,14 +16,15 @@ Currently the following docker images are provided
     - nest/nest-simulator:3.5
     - nest/nest-simulator:3.6
     - nest/nest-simulator:3.7
+    - nest/nest-simulator:3.8
 
 ## Usage
 
 You can use the docker images direct out of docker-registry.ebrains.eu like this:
 
     docker pull nest/nest-simulator:TAG
 
-TAG is '2.20.2', '3.2', '3.3', '3.4', '3.5', '3.6', '3.7' or 'dev'.
+TAG is '2.20.2', '3.2', '3.3', '3.4', '3.5', '3.6', '3.7', '3.8'or 'dev'.
 
 #### NEST 2.20.2
 
@@ -37,7 +38,7 @@ Jupyter lab with NEST 2.20.2
     docker run -it --rm -e LOCAL_USER_ID=`id -u $USER` -v $(pwd):/opt/data -e NEST_CONTAINER_MODE=jupyterlab \
                -p 8080:8080 nest/nest-simulator:2.20.2
 
-#### NEST 3.7
+#### NEST 3.8
 
 To use 'docker-compose' you need the definition file from the git repository. Download it:
 
@@ -50,7 +51,7 @@ To use 'docker-compose' you need the definition file from the git repository. Do
   or
 
       docker run -it --rm -e NEST_CONTAINER_MODE=nest-server -p 52425:52425 \
-           nest/nest-simulator:3.7 
+           nest/nest-simulator:3.8
 
   Starts the NEST API server container and opens the corresponding port 52425. Test it with `curl localhost:52425/api`.
 
@@ -61,9 +62,9 @@ To use 'docker-compose' you need the definition file from the git repository. Do
   or
 
       docker run -it --rm -e NEST_CONTAINER_MODE=nest-server -p 52425:52425 \
-          nest/nest-simulator:3.7
+          nest/nest-simulator:3.8
       docker run -it --rm -e LOCAL_USER_ID=`id -u $USER` -p 54286:54286  \
-          -e NEST_CONTAINER_MODE=nest-desktop nest/nest-simulator:3.7
+          -e NEST_CONTAINER_MODE=nest-desktop nest/nest-simulator:3.8
 
   Starts the NEST server and the NEST desktop web interface. Port 54286 is also made available.
   Open in the web browser: `http://localhost:54286`
@@ -75,9 +76,9 @@ To use 'docker-compose' you need the definition file from the git repository. Do
   or
 
       docker run -it --rm -e LOCAL_USER_ID=`id -u $USER` -v $(pwd):/opt/data -e NEST_CONTAINER_MODE=notebook \
-          -p 8080:8080 nest/nest-simulator:3.7
+          -p 8080:8080 nest/nest-simulator:3.8
 
-  Starts a notebook server with pre-installed NEST 3.7. The corresponding URL is displayed in the console.
+  Starts a notebook server with pre-installed NEST 3.8. The corresponding URL is displayed in the console.
 
 - Jupyter lab with NEST
 
@@ -86,9 +87,9 @@ To use 'docker-compose' you need the definition file from the git repository. Do
   or
 
       docker run -it --rm -e LOCAL_USER_ID=`id -u $USER` -v $(pwd):/opt/data -e NEST_CONTAINER_MODE=jupyterlab \
-          -p 8080:8080 nest/nest-simulator:3.7
+          -p 8080:8080 nest/nest-simulator:3.8
 
-  Starts a jupyter lab server with pre-installed NEST 3.7. The corresponding URL is displayed in the console.
+  Starts a jupyter lab server with pre-installed NEST 3.8. The corresponding URL is displayed in the console.
 
 To stop and delete running containers use `docker-compose down`.
 
@@ -129,7 +130,7 @@ You can clone this repository and use the shell script:
     [<args>]    can be either 'notebook', 'jupyterlab', or 'interactice'.
     [<version>] kind of docker image (e.g. 'dev', '2.12.0', '2.14.0',
                 '2.16.0', '2.18.0', '3.0', '3.1', '3.2', '3.3', '3.4', '3.5', 
-                '3.6', '3.7' or 'all').
+                '3.6', '3.7', '3.8' or 'all').
 
     Example:    sh run.sh provision dev
                 sh run.sh run notebook dev
@@ -138,7 +139,7 @@ You can clone this repository and use the shell script:
 
 ## 1 - 2 (- 3)
 
-In the next steps, VERSION is the kind of docker image you want to use (3.7, dev, ...)
+In the next steps, VERSION is the kind of docker image you want to use (3.8, dev, ...)
 
 Two little steps to get started
 
@@ -191,7 +192,7 @@ In the folder with your music scripts run:
 
     docker run -it --rm -e LOCAL_USER_ID=`id -u $USER`  \
                -v $(pwd):/opt/data  \
-               nest/nest-simulator:3.7 /bin/bash
+               nest/nest-simulator:3.8 /bin/bash
 
 You are now on container's shell.
 
@@ -206,7 +207,7 @@ You are now on container's shell.
 
 -   Export a docker image
 
-        docker save nest/nest-simulator:3.5 | gzip -c > nest-docker.tar.gz  
+        docker save nest/nest-simulator:3.8 | gzip -c > nest-docker.tar.gz  
 
 -   Import a docker image
 

diff --git a/ci-templates/000_3.6.gitlab-ci.yml b/ci-templates/000_3.6.gitlab-ci.yml
@@ -6,7 +6,7 @@ Build_36:
   stage: build
   needs: ["Build_Base"]
   rules:
-    - when: always
+    - when: never
   script:
     # Build
     - docker pull nest/nest-simulator:3.6 || true

diff --git a/ci-templates/000_3.7.gitlab-ci.yml b/ci-templates/000_3.7.gitlab-ci.yml
@@ -9,7 +9,7 @@ Build_3.7:
     - when: always
   script:
     # Build
-    - docker pull push nest/nest-simulator:3.7 || true
+    - docker pull nest/nest-simulator:3.7 || true
     - docker build
         --cache-from nest/nest-simulator:3.7
         --tag nest/nest-simulator:3.7

diff --git a/ci-templates/000_3.8.gitlab-ci.yml b/ci-templates/000_3.8.gitlab-ci.yml
@@ -0,0 +1,25 @@
+###############################################
+###               3.8                  ###
+###############################################
+
+
+Build_3.8:
+  stage: build
+  rules:
+    - when: always
+  script:
+    # Build
+    - docker pull nest/nest-simulator:3.8 || true
+    - docker build
+        --cache-from nest/nest-simulator:3.8
+        --tag nest/nest-simulator:3.8_rc1
+        ./src/3.8
+    # Test
+    #- docker run -i --rm nest/nest-simulator:3.8bash /opt/test-nest.sh
+    # Deploy
+    - echo -n $DOCKERHUB_REGISTRY_TOKEN | docker login -u $DOCKERHUB_REGISTRY_USER --password-stdin
+    - docker push nest/nest-simulator:3.8_rc1
+    - docker logout $DOCKERHUB_REGISTRY
+  tags:
+    - shell-runner
+
diff --git a/ci-templates/000_dev.gitlab-ci.yml b/ci-templates/000_dev.gitlab-ci.yml
@@ -8,7 +8,7 @@ Build_Dev:
     - when: always
   script:
     # Build
-    - docker pull push nest/nest-simulator:dev || true
+    - docker pull nest/nest-simulator:dev || true
     - docker build
         --cache-from nest/nest-simulator:dev
         --tag nest/nest-simulator:dev

diff --git a/ci-templates/001_base.gitlab-ci.yml b/ci-templates/001_base.gitlab-ci.yml
@@ -4,6 +4,8 @@
 
 Build_Base:
   stage: build
+  rules:
+   - when: never
   script:
     - docker pull $DOCKER_REGISTRY_IMAGE:nest-simulator-build-base || true
     - docker pull $DOCKER_REGISTRY_IMAGE:nest-simulator-deploy-base || true

diff --git a/ci-templates/003_2.20.2.gitlab-ci.yml b/ci-templates/003_2.20.2.gitlab-ci.yml
@@ -18,8 +18,8 @@ Build_2202:
     # Deploy
     - echo -n $DOCKERHUB_REGISTRY_TOKEN | docker login -u $DOCKERHUB_REGISTRY_USER --password-stdin
     - docker push nest/nest-simulator:2.20.2
-    - docker tag nest/nest-simulator:2.20.2 $DOCKER_REGISTRY_IMAGE:2.20.2
-    - docker push $DOCKER_REGISTRY_IMAGE:2.20.2  
+    #- docker tag nest/nest-simulator:2.20.2 $DOCKER_REGISTRY_IMAGE:2.20.2
+    #- docker push $DOCKER_REGISTRY_IMAGE:2.20.2  
     - docker logout $DOCKERHUB_REGISTRY
     - docker logout $DOCKER_REGISTRY
   tags:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,15 +2,15 @@ version: "3"
 
 services:
   nest-server:
-    image: nest/nest-simulator:3.7
+    image: nest/nest-simulator:3.8
     environment:
       LOCAL_USER_ID: "`id -u $USER`"
       NEST_CONTAINER_MODE: "nest-server"
     ports:
       - "52425:52425"
 
   nest-desktop:
-    image: nest/nest-simulator:3.7
+    image: nest/nest-simulator:3.8
     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.7
+    image: nest/nest-simulator:3.8
     volumes:
       - .:/opt/data
     environment:
@@ -30,7 +30,7 @@ services:
       - "8080:8080"
 
   nest-jupyterlab:
-    image: nest/nest-simulator:3.7
+    image: nest/nest-simulator:3.8
     volumes:
       - .:/opt/data
     environment:

diff --git a/run.sh b/run.sh
@@ -50,11 +50,12 @@ case $command in
         echo
 
         echo "Provisioning needs an argument: 'dev' 'latest_daint' '2.12.0', '2.14.0', '2.14.2',"
-        echo "'2.16.0', '2.18.0', '2.20.0', '2.20.1', '2.20.2', '3.0','3.1', '3.2', '3.3', '3.4', '3.5', '3.6', '3.7','all' or 'base'."
+        echo "'2.16.0', '2.18.0', '2.20.0', '2.20.1', '2.20.2', '3.0','3.1', '3.2', '3.3', '3.4', '3.5', '3.6', '3.7', " 
+        echo "'3.8', 'all' or 'base'."
         echo
         while test $# -gt 0; do
             case "$1" in
-            dev | latest_daint | 2.12.0 | 2.14.0 | 2.14.2 | 2.16.0 | 2.18.0 | 2.20.0 | 2.20.1 | 2.20.2 | 3.0 | 3.1 | 3.2 | 3.3 | 3.4 | 3.5 | 3.6 | 3.7 )
+            dev | latest_daint | 2.12.0 | 2.14.0 | 2.14.2 | 2.16.0 | 2.18.0 | 2.20.0 | 2.20.1 | 2.20.2 | 3.0 | 3.1 | 3.2 | 3.3 | 3.4 | 3.5 | 3.6 | 3.7 | 3.8 )
                 echo "Build the NEST image for NEST $1"
                 echo
                 docker build -t nest/nest-simulator:"$1" ./src/"$1"
@@ -73,7 +74,7 @@ case $command in
             all)
                 echo "Build the NEST image for NEST 2.12.0, 2.14.0, 2.14.2"
                 echo "2.16.0, 2.18.0, 2.20.0, 2.20.1, 2.20.2, 3.0, 3.1, 3.2," 
-                echo "3.3, 3.4, 3.5, 3.6, 3.7, dev and latest_daint"
+                echo "3.3, 3.4, 3.5, 3.6, 3.7, 3.8, dev and latest_daint"
                 echo
                 docker build -t nest/nest-simulator:2.12.0 ./src/2.12.0
                 docker build -t nest/nest-simulator:2.14.0 ./src/2.14.0
@@ -91,6 +92,7 @@ case $command in
                 docker build -t nest/nest-simulator:3.5 ./src/3.5
                 docker build -t nest/nest-simulator:3.6 ./src/3.6
                 docker build -t nest/nest-simulator:3.7 ./src/3.7
+                docker build -t nest/nest-simulator:3.7 ./src/3.8
                 docker build -t nest/nest-simulator:dev ./src/dev
                 docker build -t nest/nest-simulator:latest_daint ./src/latest_daint
                 echo
@@ -114,14 +116,14 @@ case $command in
         echo
         echo "VERSION is the version of NEST"
         echo "(e.g. dev, 2.12.0, 2.14.0, 2.14.2,  2.16.0, 2.18.0, 2.20.0," 
-        echo "2.20.1, 2.20.2, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7)"
+        echo "2.20.1, 2.20.2, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8)"
         echo
     LOCALDIR="$(pwd)"
     while test $# -gt 1; do
         case "$1" in
             notebook)
                 case "$2" in
-                    dev | 2.12.0 | 2.14.0 | 2.14.2 | 2.16.0 | 2.18.0 | 2.20.0 | 2.20.1 | 2.20.2 | 3.0 | 3.1 | 3.2 | 3.3 | 3.4 | 3.5 | 3.6 | 3.7 )
+                    dev | 2.12.0 | 2.14.0 | 2.14.2 | 2.16.0 | 2.18.0 | 2.20.0 | 2.20.1 | 2.20.2 | 3.0 | 3.1 | 3.2 | 3.3 | 3.4 | 3.5 | 3.6 | 3.7 | 3.8 )
                     echo "Run NEST-$2 with Jupyter Notebook".
                     echo
                     docker run -it --rm -e LOCAL_USER_ID=`id -u $USER` --name my_app  \
@@ -137,7 +139,7 @@ case $command in
             ;;
             jupyterlab)
                 case "$2" in
-                    dev | 2.12.0 | 2.14.0 | 2.14.2 | 2.16.0 | 2.18.0 | 2.20.0 | 2.20.1 | 2.20.2 | 3.0 | 3.1 | 3.2 | 3.3 | 3.4 | 3.5 | 3.6 | 3.7 )
+                    dev | 2.12.0 | 2.14.0 | 2.14.2 | 2.16.0 | 2.18.0 | 2.20.0 | 2.20.1 | 2.20.2 | 3.0 | 3.1 | 3.2 | 3.3 | 3.4 | 3.5 | 3.6 | 3.7 | 3.8 )
                     echo
                     docker run -it --rm -e LOCAL_USER_ID=`id -u $USER` --name my_app  \
 							   -v $(pwd):/opt/data -e NEST_CONTAINER_MODE=jupyterlab \
@@ -152,7 +154,7 @@ case $command in
             ;;
             interactive)
                 case "$2" in
-                    dev | 2.12.0 | 2.14.0 | 2.14.2 | 2.16.0 | 2.18.0 | 2.20.0 | 2.20.1 | 2.20.2 | 3.0 | 3.1 | 3.2 | 3.3 | 3.4 | 3.5 | 3.6 | 3.7 )
+                    dev | 2.12.0 | 2.14.0 | 2.14.2 | 2.16.0 | 2.18.0 | 2.20.0 | 2.20.1 | 2.20.2 | 3.0 | 3.1 | 3.2 | 3.3 | 3.4 | 3.5 | 3.6 | 3.7 | 3.8 )
                     echo "Run NEST-$2 in interactive mode."
                     echo
                     docker run -it --rm -e LOCAL_USER_ID=`id -u $USER` --name my_app  -e NEST_CONTAINER_MODE=interactive \