From 5ce54f507478deb77b74d807676ae738435ca858 Mon Sep 17 00:00:00 2001 From: Thomas Peterson Date: Fri, 28 Feb 2025 20:53:29 +0100 Subject: [PATCH] Fixes --- .docker/.env.test.example | 42 +++++++++++++++++++++++++++++++++ .gitea/workflows/run_tests.yaml | 4 ++-- .make/04-docker.mk | 4 ++++ 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 .docker/.env.test.example diff --git a/.docker/.env.test.example b/.docker/.env.test.example new file mode 100644 index 000000000..3cf37d121 --- /dev/null +++ b/.docker/.env.test.example @@ -0,0 +1,42 @@ +# docker-compose env vars +# @see https://docs.docker.com/compose/reference/envvars/ +COMPOSE_CONVERT_WINDOWS_PATHS=1 + +# application +APP_GROUP_NAME=application + +# application +APP_SSH_PASSWORD=123456 + +# mysql +MYSQL_DATABASE=psc_test +MYSQL_PASSWORD=psc +MYSQL_USER=psc + +#APP_USER_NAME=application +#APP_USER_ID=10000 +#APP_GROUP_ID=10001 + +APP_CODE_PATH_CONTAINER=/data/www +APPLICATION_CODE_PATH_CONTAINER=/application +APP_CODE_PATH_HOST=../../src +APPLICATION_CODE_PATH_HOST=../../ +APP_CODE_PATH_HOST=../../src + +APP_HOST=app.local +NETWORKS_DRIVER=bridge + +MYSQL_BACKUP_PATH_HOST=../../dev_db/mysql.sql + +NGINX_HOST_HTTP_PORT=80 +NGINX_HOST_HTTPS_PORT=443 + +PHP_IDE_CONFIG=serverName=psc +VOLUMES_DRIVER=local + +ALPINE_VERSION=3.12 +COMPOSER_VERSION=2.2.5 +MYSQL_VERSION=11 +MONGODB_VERSION=7 +NGINX_VERSION=1.21.5-alpine +PHP_VERSION=8.2 diff --git a/.gitea/workflows/run_tests.yaml b/.gitea/workflows/run_tests.yaml index 19bef47bc..30b930175 100644 --- a/.gitea/workflows/run_tests.yaml +++ b/.gitea/workflows/run_tests.yaml @@ -22,7 +22,7 @@ jobs: - name: Init run: | make make-init ENVS="ENV=ci TAG=latest" - make docker-compose-init + make docker-compose-init-test - name: Build Images run: | make docker-compose-build @@ -62,7 +62,7 @@ jobs: - name: Init run: | make make-init ENVS="ENV=ci TAG=latest" - make docker-compose-init + make docker-compose-init-test - name: Build Images run: | make docker-compose-build diff --git a/.make/04-docker.mk b/.make/04-docker.mk index 1a8595edf..3e5210984 100644 --- a/.make/04-docker.mk +++ b/.make/04-docker.mk @@ -86,6 +86,10 @@ endif docker-compose-init: ## Initialize the .env file for docker compose @cp $(DOCKER_ENV_FILE).example $(DOCKER_ENV_FILE) +.PHONY: docker-compose-init-test +docker-compose-init-test: ## Initialize the .env file for docker compose + @cp $(DOCKER_ENV_FILE).test.example $(DOCKER_ENV_FILE) + .PHONY: docker-compose-clean docker-compose-clean: ## Remove the .env file for docker compose @rm -f -v $(DOCKER_ENV_FILE)