Skip to content

Commit

Permalink
Merge branch 'fix-nest-server'
Browse files Browse the repository at this point in the history
  • Loading branch information
@steffengraber
steffengraber committed Apr 12, 2024
2 parents ab7e910 + c384fb0 commit 93b1397
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 22 deletions.
14 changes: 7 additions & 7 deletions ci-templates/000_3.7.gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################
### 3.7rc1 ###
### 3.7 ###
###############################################


Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ version: "3"

services:
nest-server:
image: nest/nest-simulator:3.6
image: nest/nest-simulator:3.7
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.7
environment:
LOCAL_USER_ID: "`id -u $USER`"
NEST_CONTAINER_MODE: "nest-desktop"
Expand All @@ -20,7 +20,7 @@ services:
- nest-server

nest-notebook:
image: nest/nest-simulator:3.6
image: nest/nest-simulator:3.7
volumes:
- .:/opt/data
environment:
Expand All @@ -30,7 +30,7 @@ services:
- "8080:8080"

nest-jupyterlab:
image: nest/nest-simulator:3.6
image: nest/nest-simulator:3.7
volumes:
- .:/opt/data
environment:
Expand Down
16 changes: 8 additions & 8 deletions run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand Down
5 changes: 3 additions & 2 deletions src/3.7rc1/Dockerfile → src/3.7/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:22.04
LABEL maintainer="[email protected]"

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
Expand Down Expand Up @@ -116,7 +116,8 @@ 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 nest-desktop --pre && \
python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/requirements_nest_server.txt && \
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
Expand Down
0 src/3.7rc1/entrypoint.sh → src/3.7/entrypoint.sh
View file
File renamed without changes.
0 src/3.7rc1/test-nest.sh → src/3.7/test-nest.sh
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion src/dev/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 93b1397

Please sign in to comment.