Move image builds into separate file

Author: Taucher2003

.gitlab-ci.yml

@@ -1,5 +1,6 @@
 stages:
   - container
+  - container:boot
 
 .dind:
   variables:
@@ -13,95 +14,5 @@ stages:
       alias: docker
       entrypoint: [ "sh", "-c", "dockerd-entrypoint.sh $DOCKER_OPTIONS" ]
 
-.image-build-base:
-  extends:
-    - .dind
-  image: ghcr.io/code0-tech/build-images/reticulum-builder:171.1-ruby-3.2.2
-  stage: container
-  script:
-    - source scripts/helpers.sh
-    - docker_login
-    - 'image=$(echo "$CI_JOB_NAME" | cut -d : -f 2)'
-    - '[ -z "$NEED_PROJECT_DOWNLOAD" ] || download_project $image'
-
-.single-image-build-base:
-  extends:
-    - .image-build-base
-  script:
-    - !reference [.image-build-base, script]
-    - build_image $image $CI_PIPELINE_ID
-    - push_image $image $CI_PIPELINE_ID
-
-.variant-image-build-base:
-  extends:
-    - .image-build-base
-  script:
-    - !reference [.image-build-base, script]
-    - build_image $image $CI_PIPELINE_ID "--build-arg VARIANT=$VARIANT"
-    - image_tag=$(get_image_tag $CI_PIPELINE_ID $VARIANT)
-    - retag_image $image $CI_PIPELINE_ID $image_tag
-    - push_image $image $image_tag
-
-container:mise:
-  extends:
-    - .single-image-build-base
-
-container:rust:
-  extends:
-    - .single-image-build-base
-  needs:
-    - container:mise
-
-container:aquila:
-  extends:
-    - .single-image-build-base
-  needs:
-    - container:rust
-  variables:
-    NEED_PROJECT_DOWNLOAD: 'true'
-
-container:draco:
-  extends:
-    - .variant-image-build-base
-  needs:
-    - container:rust
-  variables:
-    NEED_PROJECT_DOWNLOAD: 'true'
-  parallel:
-    matrix:
-      - VARIANT:
-          - rest
-
-container:taurus:
-  extends:
-    - .single-image-build-base
-  needs:
-    - container:rust
-  variables:
-    NEED_PROJECT_DOWNLOAD: 'true'
-
-container:ruby:
-  extends:
-    - .single-image-build-base
-  needs:
-    - container:mise
-
-container:postgresql:
-  extends:
-    - .single-image-build-base
-  needs:
-    - container:mise
-
-container:sagittarius:
-  extends:
-    - .variant-image-build-base
-  needs:
-    - container:ruby
-    - container:postgresql
-  variables:
-    NEED_PROJECT_DOWNLOAD: 'true'
-  parallel:
-    matrix:
-      - VARIANT:
-          - ce
-          - ee
+include:
+  - local: .gitlab/ci/*.gitlab-ci.yml

.gitlab/ci/container-build.gitlab-ci.yml

@@ -0,0 +1,92 @@
+.image-build-base:
+  extends:
+    - .dind
+  image: ghcr.io/code0-tech/build-images/reticulum-builder:171.1-ruby-3.2.2
+  stage: container
+  script:
+    - source scripts/helpers.sh
+    - docker_login
+    - 'image=$(echo "$CI_JOB_NAME" | cut -d : -f 2)'
+    - '[ -z "$NEED_PROJECT_DOWNLOAD" ] || download_project $image'
+
+.single-image-build-base:
+  extends:
+    - .image-build-base
+  script:
+    - !reference [.image-build-base, script]
+    - build_image $image $CI_PIPELINE_ID
+    - push_image $image $CI_PIPELINE_ID
+
+.variant-image-build-base:
+  extends:
+    - .image-build-base
+  script:
+    - !reference [.image-build-base, script]
+    - build_image $image $CI_PIPELINE_ID "--build-arg VARIANT=$VARIANT"
+    - image_tag=$(get_image_tag $CI_PIPELINE_ID $VARIANT)
+    - retag_image $image $CI_PIPELINE_ID $image_tag
+    - push_image $image $image_tag
+
+container:mise:
+  extends:
+    - .single-image-build-base
+
+container:rust:
+  extends:
+    - .single-image-build-base
+  needs:
+    - container:mise
+
+container:aquila:
+  extends:
+    - .single-image-build-base
+  needs:
+    - container:rust
+  variables:
+    NEED_PROJECT_DOWNLOAD: 'true'
+
+container:draco:
+  extends:
+    - .variant-image-build-base
+  needs:
+    - container:rust
+  variables:
+    NEED_PROJECT_DOWNLOAD: 'true'
+  parallel:
+    matrix:
+      - VARIANT:
+          - rest
+
+container:taurus:
+  extends:
+    - .single-image-build-base
+  needs:
+    - container:rust
+  variables:
+    NEED_PROJECT_DOWNLOAD: 'true'
+
+container:ruby:
+  extends:
+    - .single-image-build-base
+  needs:
+    - container:mise
+
+container:postgresql:
+  extends:
+    - .single-image-build-base
+  needs:
+    - container:mise
+
+container:sagittarius:
+  extends:
+    - .variant-image-build-base
+  needs:
+    - container:ruby
+    - container:postgresql
+  variables:
+    NEED_PROJECT_DOWNLOAD: 'true'
+  parallel:
+    matrix:
+      - VARIANT:
+          - ce
+          - ee