diff --git a/.bumpversion-pytorch.cfg b/.bumpversion-pytorch.cfg index 5b3d4f7..cff28b0 100644 --- a/.bumpversion-pytorch.cfg +++ b/.bumpversion-pytorch.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.1.0 +current_version = 1.1.1 commit = False message = service version: {current_version} → {new_version} tag = False diff --git a/.bumpversion-tensorflow.cfg b/.bumpversion-tensorflow.cfg index 234e05b..5f5c02a 100644 --- a/.bumpversion-tensorflow.cfg +++ b/.bumpversion-tensorflow.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.1.0 +current_version = 1.1.1 commit = False message = service version: {current_version} → {new_version} tag = False diff --git a/.github/workflows/check-image.yml b/.github/workflows/check-image.yml index b8eadb1..9a413da 100644 --- a/.github/workflows/check-image.yml +++ b/.github/workflows/check-image.yml @@ -19,16 +19,41 @@ jobs: steps: - name: Checkout repo content uses: actions/checkout@v2 + + - name: Create docker build mount directory + run: sudo mkdir -p /mnt/docker + - name: Maximize build space + uses: easimon/maximize-build-space@master + with: + root-reserve-mb: 4096 + remove-dotnet: "true" + remove-android: "true" + remove-haskell: "true" + build-mount-path: "/mnt/docker" + + - name: change docker default root path + run: | + docker info + docker info | grep "Docker Root" + sudo service docker stop + sudo sh -c 'echo "{ \"data-root\": \"/mnt/docker\" }" > /etc/docker/daemon.json' + sudo chmod 644 /etc/docker/daemon.json + sudo cat /etc/docker/daemon.json + sudo service docker start + docker info | grep "Docker Root" + - name: check disk space before image build + run: df -h + - name: ooil version - uses: docker://itisfoundation/ci-service-integration-library:v2.0.11 + uses: docker://itisfoundation/ci-service-integration-library:v2.2.1 with: args: ooil --version - name: Assemble docker compose spec - uses: docker://itisfoundation/ci-service-integration-library:v2.0.11 + uses: docker://itisfoundation/ci-service-integration-library:v2.2.1 with: args: ooil compose - name: Build all images if multiple - uses: docker://itisfoundation/ci-service-integration-library:v2.0.11 + uses: docker://itisfoundation/ci-service-integration-library:v2.2.1 with: args: docker compose build - name: test Tensorflow diff --git a/.osparc/osparc-python-runner-pytorch/metadata.yml b/.osparc/osparc-python-runner-pytorch/metadata.yml index 79188b9..e11664a 100644 --- a/.osparc/osparc-python-runner-pytorch/metadata.yml +++ b/.osparc/osparc-python-runner-pytorch/metadata.yml @@ -2,7 +2,7 @@ name: oSparc Python Runner PyTorch key: simcore/services/comp/osparc-python-runner-pytorch type: computational integration-version: 2.0.0 -version: 1.1.0 +version: 1.1.1 description: https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/refs/heads/main/app/full/services/simcore_services_comp_osparc-python-runner-pytorch.md icon: https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/main/app/icons/s4l/simcore_services_comp_osparc-python-runner-pytorch.png thumbnail: https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/main/app/thumbnails/s4l/simcore_services_comp_osparc-python-runner-pytorch.png diff --git a/.osparc/osparc-python-runner-tensorflow/metadata.yml b/.osparc/osparc-python-runner-tensorflow/metadata.yml index 513303a..3f29e34 100644 --- a/.osparc/osparc-python-runner-tensorflow/metadata.yml +++ b/.osparc/osparc-python-runner-tensorflow/metadata.yml @@ -2,7 +2,7 @@ name: oSparc Python Runner Tensorflow key: simcore/services/comp/osparc-python-runner-tensorflow type: computational integration-version: 2.0.0 -version: 1.1.0 +version: 1.1.1 description: https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/refs/heads/main/app/full/services/simcore_services_comp_osparc-python-runner-tensorflow.md icon: https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/main/app/icons/s4l/simcore_services_comp_osparc-python-runner-tensorflow.png thumbnail: https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/main/app/thumbnails/s4l/simcore_services_comp_osparc-python-runner-tensorflow.png diff --git a/Makefile b/Makefile index 84d1784..f3bb5eb 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ SHELL = /bin/sh export IMAGE_PYTORCH=osparc-python-runner-pytorch export IMAGE_TENSORFLOW=osparc-python-runner-tensorflow -export TAG_PYTORCH=1.1.0 -export TAG_TENSORFLOW=1.1.0 +export TAG_PYTORCH=1.1.1 +export TAG_TENSORFLOW=1.1.1 # PYTHON ENVIRON --------------------------------------------------------------------------------------- .PHONY: devenv @@ -28,7 +28,7 @@ define _bumpversion # upgrades as $(subst $(1),,$@) version, commits and tags @docker run -it --rm -v $(PWD):/ml-runner \ -u $(shell id -u):$(shell id -g) \ - itisfoundation/ci-service-integration-library:v2.0.11 \ + itisfoundation/ci-service-integration-library:v2.2.1 \ sh -c "cd /ml-runner && bump2version --verbose --list --config-file $(1) $(subst $(2),,$@)" endef @@ -48,7 +48,7 @@ version-pytorch-patch version-pytorch-minor version-pytorch-major: .bumpversion- define _create_run_script @docker run -it --rm -v $(PWD):/ml-runner \ -u $(shell id -u):$(shell id -g) \ - itisfoundation/ci-service-integration-library:v2.0.11 \ + itisfoundation/ci-service-integration-library:v2.2.1 \ sh -c "cd /ml-runner && \ ooil run-creator \ --runscript $(1)/service.cli/run \ @@ -65,7 +65,7 @@ create-run-script: ## assembles run scrips for pytorch and tensorflow compose-spec: ## runs ooil to assemble the docker-compose.yml file @docker run -it --rm -v $(PWD):/ml-runner \ -u $(shell id -u):$(shell id -g) \ - itisfoundation/ci-service-integration-library:v2.0.11 \ + itisfoundation/ci-service-integration-library:v2.2.1 \ sh -c "cd /ml-runner && ooil compose" build: | compose-spec ## build docker image diff --git a/common/Dockerfile b/common/Dockerfile index 8db1f1d..be30add 100644 --- a/common/Dockerfile +++ b/common/Dockerfile @@ -19,8 +19,7 @@ ARG PYTHON_VERSION=3.12.10 ENV UV_PYTHON_INSTALL_DIR=/opt/uv-python RUN mkdir -p /opt/uv-python \ && uv venv /opt/venv --python=python${PYTHON_VERSION%.*} \ - && chmod -R a+rx /opt/uv-python \ - && chown -R ${SC_USER_NAME}:${SC_USER_NAME} /opt/venv + && chmod -R a+rx /opt/uv-python ENV PATH="/opt/venv/bin:$PATH" FROM base AS production diff --git a/common/entrypoint.sh b/common/entrypoint.sh index 1cb7f2f..7942f13 100755 --- a/common/entrypoint.sh +++ b/common/entrypoint.sh @@ -68,6 +68,8 @@ else # change user property of files already around echo "Changing ownership properties of files around from $SC_USER_ID to group $CONT_GROUPNAME" find / -path /proc -prune -o -user "$SC_USER_ID" -exec chown --no-dereference "$SC_USER_NAME" {} \; + echo "Changing ownership of /opt/venv to $SC_USER_NAME" + chown -R "$SC_USER_ID" /opt/venv fi echo "Starting $* ..."