From a00c9d124ba9c08ec99626f7f2963e7286143248 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 27 Feb 2025 10:57:35 +0100 Subject: [PATCH] Fixes --- .gitea/workflows/run_tests.yaml | 4 ++-- .make/04-docker.mk | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/run_tests.yaml b/.gitea/workflows/run_tests.yaml index 67eeb052a..790eaa58d 100644 --- a/.gitea/workflows/run_tests.yaml +++ b/.gitea/workflows/run_tests.yaml @@ -25,7 +25,7 @@ jobs: make docker-compose-up - name: Load Data run: | - docker exec -i psc_local-mongodb-1 /usr/bin/mongorestore --archive < ./dev_db/mongodb.dump + docker exec -i psc_ci-mongodb-1 /usr/bin/mongorestore --archive < ./dev_db/mongodb.dump - name: Run Composer Install run: | chmod -R 0777 src/new @@ -59,7 +59,7 @@ jobs: make docker-compose-up - name: Load Data run: | - docker exec -i psc_local-mongodb-1 /usr/bin/mongorestore --archive < ./dev_db/mongodb.dump + docker exec -i psc_ci-mongodb-1 /usr/bin/mongorestore --archive < ./dev_db/mongodb.dump - name: Run Composer Install run: | chmod -R 0777 src/new diff --git a/.make/04-docker.mk b/.make/04-docker.mk index 62dd9b1a1..1ba38986d 100644 --- a/.make/04-docker.mk +++ b/.make/04-docker.mk @@ -22,7 +22,6 @@ DOCKER_COMPOSE_FILE_LOCAL_CI_PROD:=$(DOCKER_COMPOSE_DIR)/docker-compose.local.ci DOCKER_COMPOSE_FILE_LOCAL_CI:=$(DOCKER_COMPOSE_DIR)/docker-compose.local.ci.yml DOCKER_COMPOSE_FILE_LOCAL_PROD:=$(DOCKER_COMPOSE_DIR)/docker-compose.local.prod.yml DOCKER_COMPOSE_FILE_LOCAL:=$(DOCKER_COMPOSE_DIR)/docker-compose.local.yml -DOCKER_COMPOSE_FILE_CI:=$(DOCKER_COMPOSE_DIR)/docker-compose.ci.yml DOCKER_COMPOSE_FILE_PHP_BASE:=$(DOCKER_COMPOSE_DIR)/docker-compose-php-base.yml DOCKER_COMPOSE_PROJECT_NAME:=psc_$(ENV) @@ -31,7 +30,7 @@ DOCKER_COMPOSE_FILES:= ifeq ($(ENV),prod) DOCKER_COMPOSE_FILES:=-f $(DOCKER_COMPOSE_FILE_LOCAL_CI_PROD) -f $(DOCKER_COMPOSE_FILE_LOCAL_PROD) else ifeq ($(ENV),ci) - DOCKER_COMPOSE_FILES:=-f $(DOCKER_COMPOSE_FILE_LOCAL_CI_PROD) -f $(DOCKER_COMPOSE_FILE_LOCAL_CI) -f $(DOCKER_COMPOSE_FILE_CI) + DOCKER_COMPOSE_FILES:=-f $(DOCKER_COMPOSE_FILE_LOCAL_CI_PROD) -f $(DOCKER_COMPOSE_FILE_LOCAL_CI) else ifeq ($(ENV),local) DOCKER_COMPOSE_FILES:=-f $(DOCKER_COMPOSE_FILE_LOCAL_CI_PROD) -f $(DOCKER_COMPOSE_FILE_LOCAL_CI) -f $(DOCKER_COMPOSE_FILE_LOCAL_PROD) -f $(DOCKER_COMPOSE_FILE_LOCAL) endif