Skip to content
Snippets Groups Projects

Fix CI for Docker-in-Docker changes

Merged Marcel Loose requested to merge fix-ci into master
1 file
+ 15
13
Compare changes
  • Side-by-side
  • Inline
+ 15
13
image: docker:stable
image: docker:latest
workflow:
rules:
@@ -50,8 +50,8 @@ versioning:
stage: build
needs: ["versioning"]
image: docker:latest
services:
- docker:dind
tags:
- dind
before_script:
- echo "Logging in as $CI_REGISTRY_USER @ $CI_REGISTRY"
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
@@ -85,7 +85,9 @@ build_base:
install_linc:
stage: build
needs: ["versioning","build_base"]
image: docker:stable
image: docker:latest
tags:
- dind
extends: .prepare
script:
- |
@@ -208,9 +210,9 @@ build_doc:
deploy_docker:
stage: deploy
needs: ["versioning", "download_data"]
image: docker:20.10
services:
- docker:20.10-dind
image: docker:latest
tags:
- dind
before_script:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
- echo $DH_REGISTRY_PASSWORD | docker login -u $DH_REGISTRY_USER --password-stdin
@@ -228,9 +230,9 @@ deploy_docker:
deploy_release:
stage: deploy
needs: ["versioning", "download_data"]
image: docker:20.10
services:
- docker:20.10-dind
image: docker:latest
tags:
- dind
before_script:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
- echo $DH_REGISTRY_PASSWORD | docker login -u $DH_REGISTRY_USER --password-stdin
@@ -259,9 +261,9 @@ deploy_docker_tag_stable:
stage: deploy
needs: ["versioning", "download_data"]
when: manual
image: docker:20.10
services:
- docker:20.10-dind
image: docker:latest
tags:
- dind
before_script:
- echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
- echo $DH_REGISTRY_PASSWORD | docker login -u $DH_REGISTRY_USER --password-stdin
Loading