From 2ff4f2a7c291834d296796313b63dc9f9182d274 Mon Sep 17 00:00:00 2001 From: THomas Peterson Date: Wed, 28 May 2025 19:39:17 +0000 Subject: [PATCH] Small Fixes for Dev --- .docker/.env.example | 2 +- .make/04-docker.mk | 5 +++++ .make/05-symfony.mk | 7 +++++++ src/new/.env | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.docker/.env.example b/.docker/.env.example index 971b68711..3beea662f 100644 --- a/.docker/.env.example +++ b/.docker/.env.example @@ -30,7 +30,7 @@ NETWORKS_DRIVER=bridge MYSQL_BACKUP_PATH_HOST=../../dev_db/mysql.sql NGINX_HOST_HTTP_PORT=80 -NGINX_HOST_HTTPS_PORT=443 +NGINX_HOST_HTTPS_PORT=444 PHP_IDE_CONFIG=serverName=psc VOLUMES_DRIVER=local diff --git a/.make/04-docker.mk b/.make/04-docker.mk index 92c0cdb49..702822dcb 100644 --- a/.make/04-docker.mk +++ b/.make/04-docker.mk @@ -145,6 +145,11 @@ docker-compose-build-no-cache: docker-compose-build-php-no-cache docker-compose- docker-compose-up: validate-docker-compose-variables ## Create and start all docker containers. To create/start only a specific container, use DOCKER_SERVICE_NAME= $(DOCKER_COMPOSE) up -d $(DOCKER_SERVICE_NAME) +.PHONY: docker-compose-import +docker-compose-import: validate-docker-compose-variables ## Import Data + docker exec -i psc_$(ENV)-mysql-1 mariadb psc < ./dev_db/mysql.sql + docker exec -i psc_$(ENV)-mongodb-1 mongorestore --archive < ./dev_db/mongodb.dump + .PHONY: docker-compose-down docker-compose-down: validate-docker-compose-variables ## Stop and remove all docker containers. @$(DOCKER_COMPOSE) down diff --git a/.make/05-symfony.mk b/.make/05-symfony.mk index ac0c95099..c7714d7fb 100644 --- a/.make/05-symfony.mk +++ b/.make/05-symfony.mk @@ -3,3 +3,10 @@ .PHONY: console console: ## Run composer commands. Specify the command e.g. via ARGS="install" $(EXECUTE_IN_APPLICATION_CONTAINER) php "/application/src/new/bin/console" $(ARGS); + +.PHONY: symfony-init +symfony-init: ## init Symfony + $(EXECUTE_IN_APPLICATION_CONTAINER) php "/application/src/new/bin/console" lexik:jwt:generate-keypair --overwrite; + $(EXECUTE_IN_APPLICATION_CONTAINER) php "/application/src/new/bin/console" importmap:install; + $(EXECUTE_IN_APPLICATION_CONTAINER) php "/application/src/new/bin/console" asset-map:compile; + $(EXECUTE_IN_APPLICATION_CONTAINER) php "/application/src/new/bin/console" assets:install; diff --git a/src/new/.env b/src/new/.env index 604717e3c..dc12d5831 100644 --- a/src/new/.env +++ b/src/new/.env @@ -31,3 +31,4 @@ JWT_PASSPHRASE=f7754c7a99638fe7162a144825ddaea7 # postgresql+advisory://db_user:db_password@localhost/db_name LOCK_DSN=flock ###< symfony/lock ### +MAILER_DSN=smtp://smtp4dev:25