Commit c0d63013 authored by Cresson Remi's avatar Cresson Remi
Browse files

CI: fix docker push

parent 2cc415ac
2 merge requests!45Release 3.2.1,!43FIX: sampler bug (wrong geometries count)
Pipeline #36462 failed with stages
in 78 minutes and 12 seconds
Showing with 8 additions and 8 deletions
+8 -8
...@@ -10,6 +10,7 @@ variables: ...@@ -10,6 +10,7 @@ variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
CACHE_IMAGE_BASE: $CI_REGISTRY_IMAGE:otbtf-base CACHE_IMAGE_BASE: $CI_REGISTRY_IMAGE:otbtf-base
CACHE_IMAGE_BUILDER: $CI_REGISTRY_IMAGE:builder CACHE_IMAGE_BUILDER: $CI_REGISTRY_IMAGE:builder
BRANCH_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
workflow: workflow:
rules: rules:
...@@ -44,6 +45,7 @@ docker image: ...@@ -44,6 +45,7 @@ docker image:
--build-arg BASE_IMG="ubuntu:20.04" --build-arg BASE_IMG="ubuntu:20.04"
--build-arg BUILDKIT_INLINE_CACHE=1 --build-arg BUILDKIT_INLINE_CACHE=1
"." "."
- docker push $CACHE_IMAGE_BASE
- > - >
docker build docker build
--target builder --target builder
...@@ -57,24 +59,22 @@ docker image: ...@@ -57,24 +59,22 @@ docker image:
--build-arg BASE_IMG="ubuntu:20.04" --build-arg BASE_IMG="ubuntu:20.04"
--build-arg BUILDKIT_INLINE_CACHE=1 --build-arg BUILDKIT_INLINE_CACHE=1
"." "."
- docker push $CACHE_IMAGE_BUILDER
- > - >
docker build docker build
--network="host" --network="host"
--cache-from $CACHE_IMAGE_BASE --cache-from $CACHE_IMAGE_BASE
--cache-from $CACHE_IMAGE_BUILDER --cache-from $CACHE_IMAGE_BUILDER
--cache-from $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME --cache-from $BRANCH_IMAGE
--cache-from $CI_REGISTRY_IMAGE:cpu-basic-dev-testing --cache-from $CI_REGISTRY_IMAGE:cpu-basic-dev-testing
--tag $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME --tag $BRANCH_IMAGE
--build-arg OTBTESTS="true" --build-arg OTBTESTS="true"
--build-arg KEEP_SRC_OTB="true" --build-arg KEEP_SRC_OTB="true"
--build-arg BZL_CONFIGS="" --build-arg BZL_CONFIGS=""
--build-arg BASE_IMG="ubuntu:20.04" --build-arg BASE_IMG="ubuntu:20.04"
--build-arg BUILDKIT_INLINE_CACHE=1 --build-arg BUILDKIT_INLINE_CACHE=1
"." "."
after_script: - docker push $BRANCH_IMAGE
- docker push $CACHE_IMAGE_BASE
- docker push $CACHE_IMAGE_BUILDER
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
.static_analysis_base: .static_analysis_base:
stage: Static Analysis stage: Static Analysis
...@@ -160,8 +160,8 @@ deploy: ...@@ -160,8 +160,8 @@ deploy:
timeout: 10 hours timeout: 10 hours
script: script:
- echo "Shippping!" - echo "Shippping!"
- docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME - docker pull $BRANCH_IMAGE
- docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME $CI_REGISTRY_IMAGE:cpu-basic-dev-testing - docker tag $BRANCH_IMAGE $CI_REGISTRY_IMAGE:cpu-basic-dev-testing
- docker push $CI_REGISTRY_IMAGE:cpu-basic-dev-testing - docker push $CI_REGISTRY_IMAGE:cpu-basic-dev-testing
- 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_IMAGE: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_IMAGE:cpu-basic
......
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