diff --git a/ci/ci-config.yml b/ci/ci-config.yml index ec506ffc50..567a5d6678 100644 --- a/ci/ci-config.yml +++ b/ci/ci-config.yml @@ -82,14 +82,6 @@ variables: PHP_UNIT_ALL_TESTS_AD_SOURCE_TYPE: "parallel" #parallel, sequential # Deploy - # - # DEPLOY_BUILD_IMAGE_TO_GITLAB: - #DEPLOY_BUILD_IMAGE_TO_GITLAB_SCHEDULE: "false" - - # DEPLOY_DEV_IMAGE_TO_GITLAB: - #DEPLOY_DEV_IMAGE_TO_GITLAB_SCHEDULE: "false" - - # DEPLOY_IMAGES_TO_DOCKERHUB: # DEPLOY_CUSTOMER_IMAGE_TO_REGISTRY: #DEPLOY_CUSTOMER_IMAGE_TO_REGISTRY: "true" # default is false diff --git a/ci/gitlab-ci/deploy_jobs.yml b/ci/gitlab-ci/deploy_jobs.yml index 0fd5159330..7cdaf80d59 100644 --- a/ci/gitlab-ci/deploy_jobs.yml +++ b/ci/gitlab-ci/deploy_jobs.yml @@ -66,6 +66,7 @@ deploy-built-image-to-dockerhub: rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_LABELS =~ /deploy-built-image-to-dockerhub/ when: manual + - if: $PIPELINE_TYPE =~ /release-lts(,|$)/ - if: $PIPELINE_TYPE =~ /release-be(,|$)/ variables: LATEST: "true" diff --git a/docs/operators/Releases.md b/docs/operators/Releases.md index f02fe0bbc7..c4b2965cbc 100644 --- a/docs/operators/Releases.md +++ b/docs/operators/Releases.md @@ -8,7 +8,7 @@ git tag | `weekly-.[*]` | `main-.[*]` | `-, latest | no |