From b9b45ed152a3f0bac65c1b27d6233efe7e0bc9a2 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Sun, 25 Aug 2024 06:10:41 +0200
Subject: [PATCH] ci(gitlab-ci): unify setup and containers stages

---
 .gitlab-ci.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8aabed795..7ae5c0064 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,6 @@ default:
 
 stages:
   - setup
-  - containers
   - frontend
   - backend
   - release # TODO
@@ -68,8 +67,8 @@ setup:dynamic:
   rules:
     - when: always
 
-containers:frontend: &containers-frontend
-  stage: containers
+setup:containers:frontend: &containers-frontend
+  stage: setup
   needs:
     - setup:dynamic
   image: ${IMAGE_BUILDER}
@@ -81,13 +80,13 @@ containers:frontend: &containers-frontend
     - changes:
         - docker/frontend/Dockerfile
   interruptible: false
-containers:frontend:manual:
+setup:containers:frontend:manual:
   <<: *containers-frontend
   rules:
     - when: manual
 
-containers:backend: &containers-backend
-  stage: containers
+setup:containers:backend: &containers-backend
+  stage: setup
   needs:
     - setup:dynamic
   image: ${IMAGE_BUILDER}
@@ -99,7 +98,7 @@ containers:backend: &containers-backend
     - changes:
         - docker/backend/Dockerfile
   interruptible: false
-containers:backend:manual:
+setup:containers:backend:manual:
   <<: *containers-backend
   rules:
     - when: manual
@@ -109,7 +108,7 @@ frontend:
   stage: frontend
   needs:
     - setup:dynamic
-    - job: containers:frontend
+    - job: setup:containers:frontend
       optional: true
   trigger:
     strategy: depend
@@ -121,7 +120,7 @@ backend:
   stage: backend
   needs:
     - setup:dynamic
-    - job: containers:backend
+    - job: setup:containers:backend
       optional: true
     - frontend
   trigger: