From 98a69665f27264853a105969fd0d5aa4f26f855f Mon Sep 17 00:00:00 2001 From: Andrei Neagu Date: Wed, 22 Jan 2025 09:17:27 +0100 Subject: [PATCH] update ci-service-integration-library:v2.0.9-dev and docker compose v2 --- .github/workflows/check-image.yml | 10 +++++----- Makefile | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/check-image.yml b/.github/workflows/check-image.yml index baa7f19..152a7df 100644 --- a/.github/workflows/check-image.yml +++ b/.github/workflows/check-image.yml @@ -9,14 +9,14 @@ jobs: - name: Checkout repo content uses: actions/checkout@v2 - name: ooil version - uses: docker://itisfoundation/ci-service-integration-library:v1.0.1-dev-32 + uses: docker://itisfoundation/ci-service-integration-library:v2.0.9-dev with: args: ooil --version - - name: Assemble docker-compose spec - uses: docker://itisfoundation/ci-service-integration-library:v1.0.1-dev-32 + - name: Assemble docker compose spec + uses: docker://itisfoundation/ci-service-integration-library:v2.0.9-dev with: args: ooil compose - name: Build all images if multiple - uses: docker://itisfoundation/ci-service-integration-library:v1.0.1-dev-32 + uses: docker://itisfoundation/ci-service-integration-library:v2.0.9-dev with: - args: docker-compose build + args: docker compose build diff --git a/Makefile b/Makefile index 7f60d79..63c99c7 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ define _bumpversion # upgrades as $(subst $(1),,$@) version, commits and tags @docker run -it --rm -v $(PWD):/sct_label_utils \ -u $(shell id -u):$(shell id -g) \ - itisfoundation/ci-service-integration-library:v1.0.1-dev-32 \ + itisfoundation/ci-service-integration-library:v2.0.9-dev \ sh -c "cd /sct_label_utils && bump2version --verbose --list --config-file $(1) $(subst $(2),,$@)" endef @@ -28,19 +28,19 @@ version-patch version-minor version-major: .bumpversion.cfg ## increases service compose-spec: ## runs ooil to assemble the docker-compose.yml file @docker run -it --rm -v $(PWD):/sct_label_utils \ -u $(shell id -u):$(shell id -g) \ - itisfoundation/ci-service-integration-library:v1.0.1-dev-32 \ + itisfoundation/ci-service-integration-library:v2.0.9-dev \ sh -c "cd /sct_label_utils && ooil compose" .PHONY: build build: compose-spec ## build docker images - docker-compose build + docker compose build #.PHONY: run-local run-local: ## runs images with local configuration. TODO: make application start with inputs provided. Not it just waits for the input rm -f sct_label_utils.zip smbget -U ${DEVOPS_USER}%${DEVOPS_PASSWORD} smb://biobackup.speag.com/osparc/data/sct_label_utils/sct_label_utils.zip -o sct_label_utils.zip unzip -o sct_label_utils.zip -d validation/input - docker-compose --file docker-compose-local.yml up + docker compose --file docker-compose-local.yml up .PHONY: shell-app up shell-app: ## enter app container