Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion-pytorch.cfg
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .bumpversion-tensorflow.cfg
Original file line number Diff line number Diff line change
@@ -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
Expand Down
31 changes: 28 additions & 3 deletions .github/workflows/check-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .osparc/osparc-python-runner-pytorch/metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .osparc/osparc-python-runner-tensorflow/metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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 \
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions common/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions common/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 $* ..."
Expand Down