From 29adbb262ff08cda691e06bf1128fd78179d43ec Mon Sep 17 00:00:00 2001 From: Steffen Graber Date: Fri, 9 Feb 2024 12:27:14 +0000 Subject: [PATCH 1/4] Merge build and deploy to fix deploy problems --- ci-templates/000_3.6.gitlab-ci.yml | 16 +++++----------- ci-templates/000_dev.gitlab-ci.yml | 14 ++++---------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/ci-templates/000_3.6.gitlab-ci.yml b/ci-templates/000_3.6.gitlab-ci.yml index 8023a68..5422946 100644 --- a/ci-templates/000_3.6.gitlab-ci.yml +++ b/ci-templates/000_3.6.gitlab-ci.yml @@ -8,23 +8,16 @@ Build_36: rules: - when: always script: + # Build - docker pull nest/nest-simulator:3.6 || true - docker build --cache-from nest/nest-simulator:3.6 --tag nest/nest-simulator:3.6 ./src/3.6 - # Simple test + # Test - docker run -i --rm nest/nest-simulator:3.6 bash /opt/test-nest.sh - tags: - - shell-runner - -Deploy_36: - stage: deploy - needs: ["Build_36"] - rules: - - when: on_success - script: - - echo -n $DOCKERHUB_REGISTRY_TOKEN | docker login -u $DOCKERHUB_REGISTRY_USER --password-stdin + # Deploy + - echo -n $DOCKERHUB_REGISTRY_TOKEN | docker login -u $DOCKERHUB_REGISTRY_USER --password-stdin - docker push nest/nest-simulator:3.6 - docker tag nest/nest-simulator:3.6 $DOCKER_REGISTRY_IMAGE:3.6 - docker push $DOCKER_REGISTRY_IMAGE:3.6 @@ -32,3 +25,4 @@ Deploy_36: - docker logout $DOCKER_REGISTRY tags: - shell-runner + diff --git a/ci-templates/000_dev.gitlab-ci.yml b/ci-templates/000_dev.gitlab-ci.yml index 45c983a..af666ff 100644 --- a/ci-templates/000_dev.gitlab-ci.yml +++ b/ci-templates/000_dev.gitlab-ci.yml @@ -8,24 +8,18 @@ Build_Dev: rules: - when: always script: + # Build - docker pull push nest/nest-simulator:dev || true - docker build --cache-from nest/nest-simulator:dev --tag nest/nest-simulator:dev ./src/dev - # Simple test + # Test - docker run -i --rm nest/nest-simulator:dev bash /opt/test-nest.sh - tags: - - shell-runner - -Deploy_Dev: - stage: deploy - needs: ["Build_Dev"] - rules: - - when: on_success - script: + # Deploy - echo -n $DOCKERHUB_REGISTRY_TOKEN | docker login -u $DOCKERHUB_REGISTRY_USER --password-stdin - docker push nest/nest-simulator:dev - docker logout $DOCKERHUB_REGISTRY tags: - shell-runner + From 1adf82e745bbfd587617352a01af2e5b3c6e4266 Mon Sep 17 00:00:00 2001 From: Steffen Graber Date: Thu, 4 Apr 2024 09:56:21 +0000 Subject: [PATCH 2/4] Add nest-server requirements --- src/3.7rc1/Dockerfile | 1 + src/dev/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/3.7rc1/Dockerfile b/src/3.7rc1/Dockerfile index 5ca0e22..fc1cc3e 100644 --- a/src/3.7rc1/Dockerfile +++ b/src/3.7rc1/Dockerfile @@ -116,6 +116,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ make install && \ 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 uninstall nestml -y && \ python3 -m pip install --upgrade https://github.com/nest/nestml/archive/refs/tags/v7.0.1-rc1.zip && \ diff --git a/src/dev/Dockerfile b/src/dev/Dockerfile index ade8ee3..01f9f3c 100644 --- a/src/dev/Dockerfile +++ b/src/dev/Dockerfile @@ -135,7 +135,7 @@ RUN mkdir ${SRC_PATH}/nest-build && cd $_ && \ # Install NESTML and more RUN 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.txt && \ 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 From 53016176d0ec8490b7442238bae9d058aca6865e Mon Sep 17 00:00:00 2001 From: Steffen Graber Date: Thu, 4 Apr 2024 10:30:49 +0000 Subject: [PATCH 3/4] Fix nest-desktop and compose file --- docker-compose.yml | 8 ++++---- src/3.7rc1/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 96c7ef5..9504522 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ 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" @@ -10,7 +10,7 @@ services: - "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: diff --git a/src/3.7rc1/Dockerfile b/src/3.7rc1/Dockerfile index fc1cc3e..421a278 100644 --- a/src/3.7rc1/Dockerfile +++ b/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 From c384fb0a12df94bbbd534048df40099aafea01d5 Mon Sep 17 00:00:00 2001 From: Steffen Graber Date: Fri, 12 Apr 2024 12:11:11 +0000 Subject: [PATCH 4/4] Add v3.7 --- ci-templates/000_3.7.gitlab-ci.yml | 14 +++++++------- docker-compose.yml | 8 ++++---- run.sh | 16 ++++++++-------- src/{3.7rc1 => 3.7}/Dockerfile | 2 +- src/{3.7rc1 => 3.7}/entrypoint.sh | 0 src/{3.7rc1 => 3.7}/test-nest.sh | 0 6 files changed, 20 insertions(+), 20 deletions(-) rename src/{3.7rc1 => 3.7}/Dockerfile (99%) rename src/{3.7rc1 => 3.7}/entrypoint.sh (100%) rename src/{3.7rc1 => 3.7}/test-nest.sh (100%) diff --git a/ci-templates/000_3.7.gitlab-ci.yml b/ci-templates/000_3.7.gitlab-ci.yml index ed4fb71..0787e97 100644 --- a/ci-templates/000_3.7.gitlab-ci.yml +++ b/ci-templates/000_3.7.gitlab-ci.yml @@ -1,5 +1,5 @@ ############################################### -### 3.7rc1 ### +### 3.7 ### ############################################### @@ -9,16 +9,16 @@ Build_3.7: - when: always script: # Build - - docker pull push nest/nest-simulator:3.7rc1 || true + - docker pull push nest/nest-simulator:3.7 || true - docker build - --cache-from nest/nest-simulator:3.7rc1 - --tag nest/nest-simulator:3.7rc1 - ./src/3.7rc1 + --cache-from nest/nest-simulator:3.7 + --tag nest/nest-simulator:3.7 + ./src/3.7 # Test - #- docker run -i --rm nest/nest-simulator:3.7rc1 bash /opt/test-nest.sh + #- docker run -i --rm nest/nest-simulator:3.7bash /opt/test-nest.sh # Deploy - echo -n $DOCKERHUB_REGISTRY_TOKEN | docker login -u $DOCKERHUB_REGISTRY_USER --password-stdin - - docker push nest/nest-simulator:3.7rc1 + - docker push nest/nest-simulator:3.7 - docker logout $DOCKERHUB_REGISTRY tags: - shell-runner diff --git a/docker-compose.yml b/docker-compose.yml index 9504522..1342de2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: nest-server: - image: nest/nest-simulator:3.7rc1 + image: nest/nest-simulator:3.7 environment: LOCAL_USER_ID: "`id -u $USER`" NEST_CONTAINER_MODE: "nest-server" @@ -10,7 +10,7 @@ services: - "52425:52425" nest-desktop: - image: nest/nest-simulator:3.7rc1 + image: nest/nest-simulator:3.7 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.7rc1 + image: nest/nest-simulator:3.7 volumes: - .:/opt/data environment: @@ -30,7 +30,7 @@ services: - "8080:8080" nest-jupyterlab: - image: nest/nest-simulator:3.7rc1 + image: nest/nest-simulator:3.7 volumes: - .:/opt/data environment: diff --git a/run.sh b/run.sh index 03955bf..f208944 100755 --- a/run.sh +++ b/run.sh @@ -50,11 +50,11 @@ 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.7rc1','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','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.7rc1 ) + 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 ) echo "Build the NEST image for NEST $1" echo docker build -t nest/nest-simulator:"$1" ./src/"$1" @@ -73,7 +73,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.7rc1, dev and latest_daint" + echo "3.3, 3.4, 3.5, 3.6, 3.7, 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 @@ -90,7 +90,7 @@ case $command in docker build -t nest/nest-simulator:3.4 ./src/3.4 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.7rc1 ./src/3.7rc1 + docker build -t nest/nest-simulator:3.7 ./src/3.7 docker build -t nest/nest-simulator:dev ./src/dev docker build -t nest/nest-simulator:latest_daint ./src/latest_daint echo @@ -114,14 +114,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.7rc1)" + echo "2.20.1, 2.20.2, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7)" 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.7rc1 ) + 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 ) echo "Run NEST-$2 with Jupyter Notebook". echo docker run -it --rm -e LOCAL_USER_ID=`id -u $USER` --name my_app \ @@ -137,7 +137,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.7rc1 ) + 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 ) 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 +152,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.7rc1 ) + 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 ) 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 \ diff --git a/src/3.7rc1/Dockerfile b/src/3.7/Dockerfile similarity index 99% rename from src/3.7rc1/Dockerfile rename to src/3.7/Dockerfile index 421a278..551368b 100644 --- a/src/3.7rc1/Dockerfile +++ b/src/3.7/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 LABEL maintainer="s.graber@fz-juelich.de" -ARG NEST_VERSION=3.7_rc1 +ARG NEST_VERSION=3.7 ARG SRC_PATH=/tmp ARG CMAKE_C_COMPILER_LAUNCHER=ccache ARG CMAKE_CXX_COMPILER_LAUNCHER=ccache diff --git a/src/3.7rc1/entrypoint.sh b/src/3.7/entrypoint.sh similarity index 100% rename from src/3.7rc1/entrypoint.sh rename to src/3.7/entrypoint.sh diff --git a/src/3.7rc1/test-nest.sh b/src/3.7/test-nest.sh similarity index 100% rename from src/3.7rc1/test-nest.sh rename to src/3.7/test-nest.sh