docker/docker-mail
1
0
Fork 0
Code Issues 4 Pull Requests Actions Projects Releases 6 Wiki Activity

ci(docker_hub): ensure build and DH push works on merge

Browse Source 
fix the merge request dockerhub build.

var CI_COMMIT_BRANCH is not available in a merge request pipleine.
adjusted the pipline to run if development branch with a commit message
starting with Merge branch.
this enables usage of variable CI_COMMIT_BRANCH.

MR !4
This commit is contained in:
Jon Lockwood
2022-02-16 12:13:31 +09:30
parent bb44b67682
commit aafd9acca9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -62,7 +62,7 @@ Docker Container:
rules:
- if: $CI_COMMIT_TAG
when: on_success
- if: '$CI_COMMIT_BRANCH == "development" && $CI_PIPELINE_SOURCE == "merge_request_event"'
- if: '$CI_COMMIT_BRANCH == "development" && $CI_COMMIT_TITLE =~ /Merge branch.*/'
when: on_success
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
when: never
@ -128,7 +128,7 @@ Docker Hub:
rules:
- if: $CI_COMMIT_TAG
when: on_success
- if: '$CI_COMMIT_BRANCH == "development" && $CI_PIPELINE_SOURCE == "merge_request_event"'
- if: '$CI_COMMIT_BRANCH == "development" && $CI_COMMIT_TITLE =~ /Merge branch.*/'
when: on_success
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
when: never