Skip to content

Commit

Permalink
update ci-service-integration-library:v2.0.9-dev and docker compose v2
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrei Neagu committed Jan 22, 2025
1 parent 4b14e8f commit 98a6966
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/check-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit 98a6966

Please sign in to comment.