Merge branch '2023.11' into 2024.11

tine-groupware · Feb 5, 2025 · a7b3a30 · a7b3a30
2 parents 875da75 + 227c303
commit a7b3a30
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git 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
@@ -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
@@ -8,7 +8,7 @@ git tag	| `weekly-<date>.<counter>[*]`	| `main-<date>.<counter>[*]` | `<tine ver
 tag eg	| weekly-2024.6.30.1	| main-2024.2.15.2 | 2024.11-2024.8.7.1 | 2023.11.4	| 2022.11.4	| metaways-2024.11-2024.01.29.3pl16	| nightly-pu-fix-packaging-2024.03.28-g19ebe82e |
 triggerd	| by schedule - weekly	| by tag (conventionally every 3. Thursday of a month) | by tag (conventionally every 3. Thursday of a month) | by tag (conventionally every 3. Thursday of a month)	| by tag (conventionally every 3. Thursday of a month)	| by tag / by schedule (depends on the customer)	| schedule / merge request |
 github release	| as pre release	| no | as pre release	| as latest	| no	| no	| no |
-dockerhub tag	| weekly, git tag	| no | tine version without .11, git tag | latest, tine version without .11, git tag	| no	| no	| no |
+dockerhub tag	| weekly, git tag	| no | tine version without .11, git tag | latest, tine version without .11, git tag	| tine version without .11, git tag	| no	| no |
 vpackages	| no	| no | no	| tine20.com/maintance, set current link	| tine20.com/maintance	| customer repo, set current link, optional	| for debug purposes |
 gitlab packages	| weekly	| monthly | no	| tine20.com	| no	| customer name / configurable | no |
 | customer registry tag	| no	| no | no | no	| no	| git tag, <customer>-<tine version withouth .11>, latest	| no |