unf
/
containers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'selfsigned-certs' into 'main' 

FIX creating allways docker-datalad image

See merge request ni-dataops/containers!2
This commit is contained in:
Basile Pinsard 2024-01-26 20:02:19 +00:00
parent b6774e2176 9d73fa0c26
commit 765acf5e82
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@ -32,13 +32,14 @@ stages:
- echo $CI_REGISTRY_USER $CI_REGISTRY $IMAGE_TAG - echo $CI_REGISTRY_USER $CI_REGISTRY $IMAGE_TAG
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker pull $IMAGE:latest || true - docker pull $IMAGE:latest || true
- docker build --cache-from $IMAGE:latest -t $IMAGE:$CI_COMMIT_SHA -t $IMAGE:$CI_COMMIT_SHORT_SHA -t $IMAGE_TAG -t $IMAGE:latest ./docker/datalad-docker - docker build --cache-from $IMAGE:latest -t $IMAGE:$CI_COMMIT_SHA -t $IMAGE:$CI_COMMIT_SHORT_SHA -t $IMAGE_TAG -t $IMAGE:latest ./docker/$IMAGE_DOCKERFILE
- docker push --all-tags $IMAGE - docker push --all-tags $IMAGE
build_docker-datalad: build_docker-datalad:
extends: .build_tpl extends: .build_tpl
variables: variables:
IMAGE: $CI_REGISTRY_IMAGE/docker-datalad IMAGE: $CI_REGISTRY_IMAGE/docker-datalad
IMAGE_DOCKERFILE: datalad-docker
rules: rules:
- changes: - changes:
- docker/datalad-docker/**/* - docker/datalad-docker/**/*
@ -48,6 +49,7 @@ build_datalad-apptainer:
extends: .build_tpl extends: .build_tpl
variables: variables:
IMAGE: $CI_REGISTRY_IMAGE/datalad-apptainer IMAGE: $CI_REGISTRY_IMAGE/datalad-apptainer
IMAGE_DOCKERFILE: datalad-apptainer
rules: rules:
- changes: - changes:
- docker/datalad-apptainer/**/* - docker/datalad-apptainer/**/*
@ -57,6 +59,7 @@ build_heudiconv:
extends: .build_tpl extends: .build_tpl
variables: variables:
IMAGE: $CI_REGISTRY_IMAGE/heudiconv IMAGE: $CI_REGISTRY_IMAGE/heudiconv
IMAGE_DOCKERFILE: heudiconv
rules: rules:
- changes: - changes:
- docker/heudiconv/**/* - docker/heudiconv/**/*
@ -66,6 +69,7 @@ build_deface:
extends: .build_tpl extends: .build_tpl
variables: variables:
IMAGE: $CI_REGISTRY_IMAGE/deface IMAGE: $CI_REGISTRY_IMAGE/deface
IMAGE_DOCKERFILE: deface
rules: rules:
- changes: - changes:
- docker/deface/**/* - docker/deface/**/*
@ -75,6 +79,7 @@ build_pydeface:
extends: .build_tpl extends: .build_tpl
variables: variables:
IMAGE: $CI_REGISTRY_IMAGE/pydeface IMAGE: $CI_REGISTRY_IMAGE/pydeface
IMAGE_DOCKERFILE: pydeface
rules: rules:
- changes: - changes:
- docker/pydeface/**/* - docker/pydeface/**/*