Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: feat(symfony4-php72) #10

Open
wants to merge 9 commits into
base: update-symfony-of-app-symfony-vue
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions .env.dist
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
# APP
SYMFONY_APP_PATH=/

# DOCKER
LOGS_DIR=/docker/logs
APP_DIR=/var/www/symfony
APP_ENV=dev
APP_DEBUG=1
APP_SECRET=93174013057b1e458ff58ae5f158a0f1

# DATABASE
POSTGRES_HOST=postgres
POSTGRES_DB=
POSTGRES_USER=
POSTGRES_PASSWORD=
POSTGRES_PORT=

# PORT WEB
WEB_PORT=
ELK_PORT=

# SYMFONY
SECRET=

#SMTP
SMTP_USER=
SMTP_PASSWORD=
SMTP_HOST=
SMTP_TRANSPORT=

#REDIS
REDIS_DSN=
REDIS_HOST=redis
26 changes: 10 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,20 @@
### Environement
.env

### Cache, session files and logs (Symfony3)
/var/cache/*
/var/logs/*
!var/cache/.gitkeep
!var/logs/.gitkeep
### Cache, session files and logs (Symfony4)
/var/

### Managed by Composer
/var/bootstrap.php.cache
/vendor/

### Assets and user uploads
/web/bundles/
/web/uploads/
### Symfony : Assets and user uploads
/public/bundles/
/public/uploads/


### PHPUnit
/phpunit.xml

### Docker
docker/logs/

### NodeJS - NPM - YARN
node_modules/
npm-debug.log*
Expand All @@ -32,8 +26,8 @@ yarn-error.log*
coverage/

### Front
src/AppBundle/Resources/public/js/
src/AppBundle/Resources/public/css/
public/build/

### Build data
/build/
### symfony/phpunit-bridge
.phpunit
phpunit.xml
66 changes: 66 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
include .env

help: ## This help.
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)

.DEFAULT_GOAL := help

build: ## Build containers
$(info --> Build containers)
@docker-compose build

up: ## Run containers
$(info --> Run containers)
@docker-compose up -d --build --force-recreate

start: ## Start containers
$(info --> Start containers)
@docker-compose start

stop: ## Stop containers
$(info --> Stop container)
@docker-compose stop

down: ## Stop and remove containers
$(info --> Stop and remove a running containers)
@docker-compose down

log: ## Display logs
$(info --> Display log)
@docker-compose logs --follow

ifeq (bash,$(firstword $(MAKECMDGOALS)))
RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
$(eval $(RUN_ARGS):;@:)

ifeq ($(RUN_ARGS),)
RUN_ARGS := php
endif
endif
bash: ## Run bash inside container app
$(info --> Run bash inside the container $(RUN_ARGS))
@docker-compose exec $(RUN_ARGS) bash

ifeq (composer,$(firstword $(MAKECMDGOALS)))
RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
$(eval $(RUN_ARGS):;@:)
endif
composer: ## Run npm inside container
$(info --> Run composer inside the container app)
@docker-compose exec app composer $(RUN_ARGS)

ifeq (npm,$(firstword $(MAKECMDGOALS)))
RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
$(eval $(RUN_ARGS):;@:)
endif
npm: ## Run npm inside container node
$(info --> Run npm inside the container node)
@docker-compose exec node npm $(RUN_ARGS)

ifeq (yarn,$(firstword $(MAKECMDGOALS)))
RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
$(eval $(RUN_ARGS):;@:)
endif
yarn: ## Run yarn inside container node
$(info --> Run npm inside the container node)
@docker-compose exec node yarn $(RUN_ARGS)
7 changes: 0 additions & 7 deletions app/.htaccess

This file was deleted.

7 changes: 0 additions & 7 deletions app/AppCache.php

This file was deleted.

57 changes: 0 additions & 57 deletions app/AppKernel.php

This file was deleted.

23 changes: 0 additions & 23 deletions app/Resources/views/app.html.twig

This file was deleted.

94 changes: 0 additions & 94 deletions app/config/config.yml

This file was deleted.

28 changes: 0 additions & 28 deletions app/config/config_dev.yml

This file was deleted.

16 changes: 0 additions & 16 deletions app/config/config_prod.yml

This file was deleted.

Loading