Merge branch '2022.11' into tine20.com/2022.11-custom

tine-groupware · Mar 7, 2024 · 79d02ff · 79d02ff
2 parents 8a1db88 + a5a96db
commit 79d02ff
Show file tree

Hide file tree

Showing 12 changed files with 1,137 additions and 168 deletions.
diff --git a/ci/gitlab-ci/abstract_customapp.yml b/ci/gitlab-ci/abstract_customapp.yml
@@ -13,8 +13,6 @@ stages:
   - merge
 
 variables:
-  # also needs to be set in build job
-  IMAGE_TAG: $CI_PROJECT_ID-$CI_PIPELINE_IID-$PHP_VERSION
   CI_IS_CUSTOMAPP: "true"
   # TESTS
   PHP_UNIT_ALL_TESTS_SOURCE_PARALLEL: "false"
@@ -39,39 +37,4 @@ workflow:
     # Do not run pipelines on push for feature branches. Only merge requests should run feature branche pipelines.
     - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME =~ /(^feat)|(^pu)|(change)/
       when: never
-    - when: always
-
-docker_build_source:
-  stage: build
-  trigger:
-    project: tine20/tine20
-    branch: $TINE20_BRANCH
-    strategy: depend
-  variables:
-    RUN_NO_TESTS: "true"
-    AUTO_MERGE: "never"
-    IMAGE_TAG: $CI_PROJECT_ID-$CI_PIPELINE_IID-$PHP_VERSION
-    DOCKER_BUILD_SOURCE: "true"
-docker_build_source_matrix:
-  stage: build
-  parallel:
-    matrix:
-      - PHP_VERSION:
-          - "7.4"
-          - "8.0"
-          - "8.1"
-  script:
-    - echo job is there for needs
-  rules:
-    - if: $NOT_TURE == "true"
-      when: on_success
-    - when: never
-
-docker_build_built:
-  stage: build
-  script:
-    - echo job is there for needs
-  rules:
-    - if: $NOT_TURE == "true"
-      when: on_success
-    - when: never
+    - when: always
diff --git a/ci/gitlab-ci/build_jobs.yml b/ci/gitlab-ci/build_jobs.yml
@@ -236,10 +236,15 @@ docker_build_source_arm64:
 docker_build_built:
   extends: .abstract_jobs.docker
   stage: build2
+  needs: []
   script:
     - !reference [.lib, script]
+    - docker_build_image base $(docker_image_hash base)
     - export BASE_IMAGE="${REGISTRY}/base:$(docker_image_hash base)";
+    - docker_build_image dependency $(docker_image_hash dependency)
     - export DEPENDENCY_IMAGE="${REGISTRY}/dependency:$(docker_image_hash dependency)";
+    - cp $DOCKER_GIT_CONFIG ./ci/dockerimage/.gitconfig
+    - ${CI_BUILDS_DIR}/${CI_PROJECT_NAMESPACE}/tine20/ci/scripts/reuse_or_build_image.sh source false
     - ${CI_BUILDS_DIR}/${CI_PROJECT_NAMESPACE}/tine20/ci/scripts/build_image.sh build
     - ${CI_BUILDS_DIR}/${CI_PROJECT_NAMESPACE}/tine20/ci/scripts/build_image.sh built
     - ${CI_BUILDS_DIR}/${CI_PROJECT_NAMESPACE}/tine20/ci/scripts/build_image.sh test-built
@@ -307,6 +312,7 @@ docker_build_dev:
   stage: build2
   script:
     - !reference [.lib, script]
+    - docker_build_image base $(docker_image_hash base)
     - export BASE_IMAGE="${REGISTRY}/base:$(docker_image_hash base)";
     - ${CI_BUILDS_DIR}/${CI_PROJECT_NAMESPACE}/tine20/ci/scripts/build_image.sh dev
   rules: