From 8b4801111da5521dcbbe907a2a4c7228cfcae84e Mon Sep 17 00:00:00 2001
From: Stephan Barth <stephan.barth@uniworx.de>
Date: Sat, 24 Aug 2024 18:49:35 +0200
Subject: [PATCH] ci(gitlab-ci): Use gitlab container runner instead of podman
 in docker (frontend part)

---
 .gitlab-ci/frontend.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci/frontend.yml b/.gitlab-ci/frontend.yml
index 64a142da9..364213f1f 100644
--- a/.gitlab-ci/frontend.yml
+++ b/.gitlab-ci/frontend.yml
@@ -51,10 +51,11 @@ compile:
   needs:
     - job: container
       optional: true
-  image: &frontend-image ${CI_REGISTRY_IMAGE}/frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION}
+#  image: &frontend-image ${CI_REGISTRY_IMAGE}/frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION}
   script:
-    - &load-frontend-image zcat docker/frontend/image.tar.gz | podman image load
-    - make -- --docker-run-frontend-build FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose
+#    - &load-frontend-image zcat docker/frontend/image.tar.gz | podman image load
+#    - make -- --docker-run-frontend-build FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose
+    - make -- frontend-build FRADRIVE_SERVICE=frontend
   artifacts:
     paths:
       - /fradrive/node_modules
@@ -71,10 +72,11 @@ lint:
   needs:
     - job: container
       optional: true
-  image: *frontend-image
+#  image: *frontend-image
   script:
-    - *load-frontend-image
-    - make -- --docker-run-frontend-lint FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose
+#    - *load-frontend-image
+#    - make -- --docker-run-frontend-lint FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose
+    - make -- frontend-lint FRADRIVE_SERVICE=frontend
   cache: *frontend-cache
 
 test:
@@ -83,9 +85,10 @@ test:
     - job: container
       optional: true
     - compile
-  image: *frontend-image
+#  image: *frontend-image
   script:
-    - *load-frontend-image
-    - make -- --docker-run-frontend-test FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose
+#    - *load-frontend-image
+#    - make -- --docker-run-frontend-test FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose
+    - make -- frontend-test FRADRIVE_SERVICE=frontend
 
   cache: *frontend-cache