boonkerz/printshopcreator
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases 2 Wiki Activity

Small Fixes for Dev
Some checks failed
Gitea Actions / Run-Tests-On-Arm64 (push) Failing after 8m3s
Details
Gitea Actions / Run-Tests-On-Amd64 (push) Successful in 26m1s
Details
Gitea Actions / Merge (push) Successful in 4s
Details

Browse Source
This commit is contained in:
THomas Peterson 2025-05-28 19:39:17 +00:00
parent f76ad94d81
commit 2ff4f2a7c2
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.docker/.env.example
View File

@ -30,7 +30,7 @@ NETWORKS_DRIVER=bridge
MYSQL_BACKUP_PATH_HOST=../../dev_db/mysql.sql MYSQL_BACKUP_PATH_HOST=../../dev_db/mysql.sql
NGINX_HOST_HTTP_PORT=80 NGINX_HOST_HTTP_PORT=80
NGINX_HOST_HTTPS_PORT=443 NGINX_HOST_HTTPS_PORT=444
PHP_IDE_CONFIG=serverName=psc PHP_IDE_CONFIG=serverName=psc
VOLUMES_DRIVER=local VOLUMES_DRIVER=local

5
.make/04-docker.mk
View File

@ -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=<service> docker-compose-up: validate-docker-compose-variables ## Create and start all docker containers. To create/start only a specific container, use DOCKER_SERVICE_NAME=<service>
$(DOCKER_COMPOSE) up -d $(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 .PHONY: docker-compose-down
docker-compose-down: validate-docker-compose-variables ## Stop and remove all docker containers. docker-compose-down: validate-docker-compose-variables ## Stop and remove all docker containers.
@$(DOCKER_COMPOSE) down @$(DOCKER_COMPOSE) down

7
.make/05-symfony.mk
View File

@ -3,3 +3,10 @@
.PHONY: console .PHONY: console
console: ## Run composer commands. Specify the command e.g. via ARGS="install" console: ## Run composer commands. Specify the command e.g. via ARGS="install"
$(EXECUTE_IN_APPLICATION_CONTAINER) php "/application/src/new/bin/console" $(ARGS); $(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;

1
src/new/.env
View File

@ -31,3 +31,4 @@ JWT_PASSPHRASE=f7754c7a99638fe7162a144825ddaea7
# postgresql+advisory://db_user:db_password@localhost/db_name # postgresql+advisory://db_user:db_password@localhost/db_name
LOCK_DSN=flock LOCK_DSN=flock
###< symfony/lock ### ###< symfony/lock ###
MAILER_DSN=smtp://smtp4dev:25