From 6a62a148294f998dae5da645e2259c7158b576af Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Wed, 17 Apr 2024 14:18:53 +0200 Subject: [PATCH 1/6] Make api key and secret available --- .osparc/jupyter-math/runtime.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.osparc/jupyter-math/runtime.yml b/.osparc/jupyter-math/runtime.yml index 3eaad03..9400c9d 100644 --- a/.osparc/jupyter-math/runtime.yml +++ b/.osparc/jupyter-math/runtime.yml @@ -22,4 +22,10 @@ callbacks-mapping: inactivity: service: container command: ["python", "/usr/local/bin/service-monitor/activity.py"] - timeout: 1 \ No newline at end of file + timeout: 1 +compose-spec: + services: + jupyter-math: + environment: + - OSPARC_API_KEY=$${OSPARC_VARIABLE_API_KEY} + - OSPARC_API_SECRET=$${OSPARC_VARIABLE_API_SECRET} From efdcfde2f28b3f2c68c31da78727e0ded8831c26 Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Tue, 20 Feb 2024 08:46:27 +0100 Subject: [PATCH 2/6] Version 2.0.10 --- .osparc/jupyter-math/metadata.yml | 2 +- docker-compose-local.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.osparc/jupyter-math/metadata.yml b/.osparc/jupyter-math/metadata.yml index 6d6309c..a615769 100644 --- a/.osparc/jupyter-math/metadata.yml +++ b/.osparc/jupyter-math/metadata.yml @@ -199,4 +199,4 @@ boot-options: description: To start as Voila save a notebook as "voila.ipynb" in the root folder -min-visible-inputs: 4 \ No newline at end of file +min-visible-inputs: 4 diff --git a/docker-compose-local.yml b/docker-compose-local.yml index 9939733..e7fca68 100644 --- a/docker-compose-local.yml +++ b/docker-compose-local.yml @@ -13,4 +13,4 @@ services: - /tmp/.X11-unix:/tmp/.X11-unix - ${PWD}/validation/workspace:/home/jovyan/work/workspace - ${PWD}/validation/inputs:/tmp/inputs - - ${PWD}/validation/outputs:/tmp/outputs \ No newline at end of file + - ${PWD}/validation/outputs:/tmp/outputs From 06e868db110e0067105b8ccfe89148e52a4418de Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Wed, 17 Apr 2024 14:17:43 +0200 Subject: [PATCH 3/6] Fix compose spec --- .osparc/jupyter-math/docker-compose.overwrite.yml | 4 ---- .osparc/jupyter-math/runtime.yml | 7 +++++-- 2 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 .osparc/jupyter-math/docker-compose.overwrite.yml diff --git a/.osparc/jupyter-math/docker-compose.overwrite.yml b/.osparc/jupyter-math/docker-compose.overwrite.yml deleted file mode 100644 index 7936dd4..0000000 --- a/.osparc/jupyter-math/docker-compose.overwrite.yml +++ /dev/null @@ -1,4 +0,0 @@ -services: - jupyter-math: - build: - dockerfile: Dockerfile diff --git a/.osparc/jupyter-math/runtime.yml b/.osparc/jupyter-math/runtime.yml index 9400c9d..f3839c5 100644 --- a/.osparc/jupyter-math/runtime.yml +++ b/.osparc/jupyter-math/runtime.yml @@ -24,8 +24,11 @@ callbacks-mapping: command: ["python", "/usr/local/bin/service-monitor/activity.py"] timeout: 1 compose-spec: + version: "3.7" services: - jupyter-math: + jupyter-math: + image: $${SIMCORE_REGISTRY}/simcore/services/dynamic/jupyter-math:$${SERVICE_VERSION} environment: - OSPARC_API_KEY=$${OSPARC_VARIABLE_API_KEY} - - OSPARC_API_SECRET=$${OSPARC_VARIABLE_API_SECRET} + - OSPARC_API_SECRET=$${OSPARC_VARIABLE_API_SECRET} +container-http-entrypoint: jupyter-math From 7020d19859d86138a9736d83a43fbce747f190f5 Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Fri, 19 Apr 2024 10:47:37 +0200 Subject: [PATCH 4/6] Add api host variable passthrough --- .osparc/jupyter-math/runtime.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.osparc/jupyter-math/runtime.yml b/.osparc/jupyter-math/runtime.yml index f3839c5..21d9cc9 100644 --- a/.osparc/jupyter-math/runtime.yml +++ b/.osparc/jupyter-math/runtime.yml @@ -29,6 +29,7 @@ compose-spec: jupyter-math: image: $${SIMCORE_REGISTRY}/simcore/services/dynamic/jupyter-math:$${SERVICE_VERSION} environment: + - OSPARC_API_HOST=$${OSPARC_VARIABLE_API_HOST} - OSPARC_API_KEY=$${OSPARC_VARIABLE_API_KEY} - OSPARC_API_SECRET=$${OSPARC_VARIABLE_API_SECRET} container-http-entrypoint: jupyter-math From 5c9adb2c84ac5e74fff8fd561b73453f29df8e44 Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Fri, 19 Apr 2024 10:57:24 +0200 Subject: [PATCH 5/6] Put docker-compose.overwrite back --- .osparc/jupyter-math/docker-compose.overwrite.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .osparc/jupyter-math/docker-compose.overwrite.yml diff --git a/.osparc/jupyter-math/docker-compose.overwrite.yml b/.osparc/jupyter-math/docker-compose.overwrite.yml new file mode 100644 index 0000000..7936dd4 --- /dev/null +++ b/.osparc/jupyter-math/docker-compose.overwrite.yml @@ -0,0 +1,4 @@ +services: + jupyter-math: + build: + dockerfile: Dockerfile From a7c256ebf5fdda2d0afd53b7a25f7f0e303f4130 Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Mon, 22 Apr 2024 10:53:37 +0200 Subject: [PATCH 6/6] New version --- .bumpversion.cfg | 2 +- .osparc/jupyter-math/metadata.yml | 2 +- Makefile | 2 +- docker-compose-local.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 5e47841..98a638d 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.0.1 +current_version = 3.0.2 commit = False message = service version: {current_version} → {new_version} tag = False diff --git a/.osparc/jupyter-math/metadata.yml b/.osparc/jupyter-math/metadata.yml index a615769..720e181 100644 --- a/.osparc/jupyter-math/metadata.yml +++ b/.osparc/jupyter-math/metadata.yml @@ -9,7 +9,7 @@ description: " key: simcore/services/dynamic/jupyter-math -version: 3.0.1 +version: 3.0.2 integration-version: 2.0.0 type: dynamic authors: diff --git a/Makefile b/Makefile index 778d9bb..c4b61f4 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SHELL = /bin/sh .DEFAULT_GOAL := help export DOCKER_IMAGE_NAME ?= jupyter-math -export DOCKER_IMAGE_TAG ?= 3.0.1 +export DOCKER_IMAGE_TAG ?= 3.0.2 # PYTHON ENVIRON --------------------------------------------------------------------------------------- diff --git a/docker-compose-local.yml b/docker-compose-local.yml index e7fca68..a6a4d4d 100644 --- a/docker-compose-local.yml +++ b/docker-compose-local.yml @@ -1,7 +1,7 @@ version: '3.7' services: jupyter-math: - image: simcore/services/dynamic/jupyter-math:3.0.1 + image: simcore/services/dynamic/jupyter-math:3.0.2 ports: - "8888:8888" environment: