Merge pull request #2 from ITISFoundation/ci-retrigger

Rerun CI

.github/workflows/check-image.yml

@@ -14,18 +14,18 @@ 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: Check disk space
         run: |
           echo "Free space:"
           df -h
       - 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

Makefile

@@ -13,7 +13,7 @@ define _bumpversion
 	# upgrades as $(subst $(1),,$@) version, commits and tags
 	@docker run -it --rm -v $(PWD):/fsl \
 		-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 /fsl && bump2version --verbose --list --config-file $(1) $(subst $(2),,$@)"
 endef
 
@@ -28,16 +28,16 @@ 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):/fsl \
 		-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 /fsl && 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
-	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

app/Dockerfile

@@ -54,10 +54,9 @@ ENV LANG=C.UTF-8
 FROM base AS production
 
 # Download and install fsl, get rid of source
-RUN wget --no-check-certificate https://fsl.fmrib.ox.ac.uk/fsldownloads/fslinstaller.py && \
-    python3 fslinstaller.py -d /usr/local/fsl -q && \
-    rm -rf /usr/local/fsl/src && \
-    rm -r /usr/local/fsl/fslpython/pkgs/*tar.bz2
+RUN wget --no-check-certificate https://fsl.fmrib.ox.ac.uk/fsldownloads/fslconda/releases/fslinstaller.py && \
+    python3 fslinstaller.py --dest /usr/local/fsl --fslversion 6.0.6.5 && \
+    rm -rf /usr/local/fsl/src
 
 # Set up FSL paths
 ENV FSLDIR=/usr/local/fsl