Skip to content
GitLab
Commit 4af9c715 authored by Cresson Remi's avatar Cresson Remi
Browse files

Merge branch 'release-3.3' into 'develop' 

CI: add version number in containers names

See merge request !44
parents 10600644 36526eeb
develop 49-zarr-geoparquet docfix-2 master move_python_packages_usr tensorrt_support test_graph_transform wip_model_output_autonaming r4.3.0 r4.2.2 r4.2.1 r4.2.0 r4.1.0 r4.0.0 r3.4.0 r3.3.0 r3.2.1
2 merge requests!45Release 3.2.1,!44CI: add version number in containers names
Hide whitespace changes
Inline Side-by-side
Showing
with 29 additions and 25 deletions
+29 -25
.gitlab-ci.yml
+ 29
− 25
View file @ 4af9c715
image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
variables: variables:
OTB_BUILD: /src/otb/build/OTB/build # Local OTB build directory OTBTF_VERSION: 3.2.1
OTBTF_SRC: /src/otbtf # Local OTBTF source directory OTB_BUILD: /src/otb/build/OTB/build # Local OTB build directory
OTB_TEST_DIR: $OTB_BUILD/Testing/Temporary # OTB testing directory OTBTF_SRC: /src/otbtf # Local OTBTF source directory
ARTIFACT_TEST_DIR: $CI_PROJECT_DIR/testing OTB_TEST_DIR: $OTB_BUILD/Testing/Temporary # OTB testing directory
CRC_BOOK_TMP: /tmp/crc_book_tests_tmp ARTIFACT_TEST_DIR: $CI_PROJECT_DIR/testing
DOCKER_BUILDKIT: 1 CRC_BOOK_TMP: /tmp/crc_book_tests_tmp
DOCKER_DRIVER: overlay2 DOCKER_BUILDKIT: 1
CACHE_IMAGE_BASE: $CI_REGISTRY_IMAGE:otbtf-base DOCKER_DRIVER: overlay2
CACHE_IMAGE_BUILDER: $CI_REGISTRY_IMAGE:builder CACHE_IMAGE_BASE: $CI_REGISTRY_IMAGE:otbtf-base
BRANCH_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME CACHE_IMAGE_BUILDER: $CI_REGISTRY_IMAGE:builder
BRANCH_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
DEV_IMAGE: $CI_REGISTRY_IMAGE:cpu-basic-dev-testing
workflow: workflow:
rules: rules:
...@@ -66,7 +68,7 @@ docker image: ...@@ -66,7 +68,7 @@ docker image:
--cache-from $CACHE_IMAGE_BASE --cache-from $CACHE_IMAGE_BASE
--cache-from $CACHE_IMAGE_BUILDER --cache-from $CACHE_IMAGE_BUILDER
--cache-from $BRANCH_IMAGE --cache-from $BRANCH_IMAGE
--cache-from $CI_REGISTRY_IMAGE:cpu-basic-dev-testing --cache-from $DEV_IMAGE
--tag $BRANCH_IMAGE --tag $BRANCH_IMAGE
--build-arg OTBTESTS="true" --build-arg OTBTESTS="true"
--build-arg KEEP_SRC_OTB="true" --build-arg KEEP_SRC_OTB="true"
...@@ -155,24 +157,26 @@ deploy: ...@@ -155,24 +157,26 @@ deploy:
image: docker/compose:latest image: docker/compose:latest
services: services:
- name: docker:dind - name: docker:dind
variables:
CI_REGISTRY_PUBIMG: $CI_REGISTRY_IMAGE/$OTBTF_VERSION
before_script: before_script:
- echo -n $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY - echo -n $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
timeout: 10 hours timeout: 10 hours
script: script:
- echo "Shippping!" - echo "Shippping!"
- docker pull $BRANCH_IMAGE - docker pull $BRANCH_IMAGE
- docker tag $BRANCH_IMAGE $CI_REGISTRY_IMAGE:cpu-basic-dev-testing - docker tag $BRANCH_IMAGE $DEV_IMAGE
- docker push $CI_REGISTRY_IMAGE:cpu-basic-dev-testing - docker push $DEV_IMAGE
- docker build --network='host' --tag $CI_REGISTRY_IMAGE:cpu-basic --build-arg BASE_IMG=ubuntu:20.04 --build-arg BZL_CONFIGS="" . # cpu-basic - docker build --network='host' --tag $CI_REGISTRY_PUBIMG:cpu-basic --build-arg BASE_IMG=ubuntu:20.04 --build-arg BZL_CONFIGS="" . # cpu-basic
- docker push $CI_REGISTRY_IMAGE:cpu-basic - docker push $CI_REGISTRY_PUBIMG:cpu-basic
- docker build --network='host' --tag $CI_REGISTRY_IMAGE:cpu-basic-dev --build-arg BASE_IMG=ubuntu:20.04 --build-arg BZL_CONFIGS="" --build-arg KEEP_SRC_OTB=true . # cpu-basic-dev - docker build --network='host' --tag $CI_REGISTRY_PUBIMG:cpu-basic-dev --build-arg BASE_IMG=ubuntu:20.04 --build-arg BZL_CONFIGS="" --build-arg KEEP_SRC_OTB=true . # cpu-basic-dev
- docker push $CI_REGISTRY_IMAGE:cpu-basic-dev - docker push $CI_REGISTRY_PUBIMG:cpu-basic-dev
- docker build --network='host' --tag $CI_REGISTRY_IMAGE:gpu --build-arg BASE_IMG=nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04 . # gpu - docker build --network='host' --tag $CI_REGISTRY_PUBIMG:gpu --build-arg BASE_IMG=nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04 . # gpu
- docker push $CI_REGISTRY_IMAGE:gpu - docker push $CI_REGISTRY_PUBIMG:gpu
- docker build --network='host' --tag $CI_REGISTRY_IMAGE:gpu-dev --build-arg BASE_IMG=nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04 --build-arg KEEP_SRC_OTB=true . # gpu-dev - docker build --network='host' --tag $CI_REGISTRY_PUBIMG:gpu-dev --build-arg BASE_IMG=nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04 --build-arg KEEP_SRC_OTB=true . # gpu-dev
- docker push $CI_REGISTRY_IMAGE:gpu-dev - docker push $CI_REGISTRY_PUBIMG:gpu-dev
- docker build --network='host' --tag $CI_REGISTRY_IMAGE:gpu-basic --build-arg BASE_IMG=nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04 --build-arg BZL_CONFIGS="" . # gpu-basic - docker build --network='host' --tag $CI_REGISTRY_PUBIMG:gpu-basic --build-arg BASE_IMG=nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04 --build-arg BZL_CONFIGS="" . # gpu-basic
- docker push $CI_REGISTRY_IMAGE:gpu-basic - docker push $CI_REGISTRY_PUBIMG:gpu-basic
- docker build --network='host' --tag $CI_REGISTRY_IMAGE:gpu-basic-dev --build-arg BZL_CONFIGS="" --build-arg BASE_IMG=nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04 --build-arg KEEP_SRC_OTB=true . # gpu-basic-dev - docker build --network='host' --tag $CI_REGISTRY_PUBIMG:gpu-basic-dev --build-arg BZL_CONFIGS="" --build-arg BASE_IMG=nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04 --build-arg KEEP_SRC_OTB=true . # gpu-basic-dev
- docker push $CI_REGISTRY_IMAGE:gpu-basic-dev - docker push $CI_REGISTRY_PUBIMG:gpu-basic-dev
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment