From d36597f906578e660070e49a3e26ab278f07b34c Mon Sep 17 00:00:00 2001
From: Konstantin Schulz <schulzkx@hu-berlin.de>
Date: Mon, 2 Oct 2023 17:26:03 +0200
Subject: [PATCH] adjust CI jobs to Docker Compose
---
.gitlab-ci.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31b8ab8..2efbba4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,23 +35,23 @@ ci_frontend:
paths:
- ci_frontend.log
when: always
- image: docker:20.10.8
+ image: docker:24.0.5
services:
- - docker:20.10.8-dind
+ - docker:24.0.5-dind
stage: ci
script:
- - docker run --rm $FRONTEND_IMAGE npm run test-ci > ci_frontend.log
+ - docker compose run --rm mc_frontend npm run test-ci > ci_frontend.log
ci_backend:
artifacts:
paths:
- ci_backend.log
when: always
- image: docker:20.10.8
+ image: docker:24.0.5
services:
- - docker:20.10.8-dind
+ - docker:24.0.5-dind
stage: ci
script:
- - docker run --env IS_THIS_A_DOCKER_CONTAINER=Yes --rm --entrypoint="./coverage_backend.sh" $BACKEND_IMAGE > ci_backend.log
+ - docker compose run --env IS_THIS_A_DOCKER_CONTAINER=Yes --rm --entrypoint="./coverage_backend.sh" mcserver > ci_backend.log
coverage:
artifacts:
paths:
--
GitLab