Skip to content

Commit

Permalink
Finish user templates refacto
Browse files Browse the repository at this point in the history
  • Loading branch information
mRoca committed Nov 7, 2020
1 parent d913589 commit 9023323
Show file tree
Hide file tree
Showing 46 changed files with 1,121 additions and 162 deletions.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@ build-prod:
docker build -t resop:latest -f docker/php-flex/Dockerfile .

start-db:
$(DOCKER_COMPOSE_UP) traefik postgres adminer
$(DOCKER_COMPOSE_UP) traefik postgres adminer mailcatcher
docker-compose run --rm wait -c postgres:5432

start-php:
$(DOCKER_COMPOSE_UP_RECREATE) traefik nginx fpm
docker-compose run --rm wait -c fpm:9000,nginx:80
@echo -n "\nStack started with success:\nhttp://resop.vcap.me:7500/login => [email protected] : 01/01/1990"
@echo -n "\nhttp://resop.vcap.me:7500/organizations/login => DT75 : covid19\n"
@echo -n "\nStack started with success: http://resop.vcap.me:7500/\[email protected] : covid19\[email protected] : covid19\[email protected] : covid19\n"

start: init-db start-php

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"symfony/form": "5.*",
"symfony/framework-bundle": "5.*",
"symfony/intl": "5.*",
"symfony/mailer": "5.0.*",
"symfony/mailer": "5.*",
"symfony/monolog-bundle": "^3.5",
"symfony/security-bundle": "5.*",
"symfony/serializer-pack": "^1.0",
Expand All @@ -41,7 +41,7 @@
"twig/intl-extra": "^3.0"
},
"require-dev": {
"alexandresalome/mailcatcher": "dev-master",
"alexandresalome/mailcatcher": "^1.3",
"behat/behat": "^3.6",
"dama/doctrine-test-bundle": "^6.3",
"escapestudios/symfony2-coding-standard": "^3.11",
Expand Down
Loading

0 comments on commit 9023323

Please sign in to comment.