Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: loperd/symfony-dockerized
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.1.0
Choose a base ref
...
head repository: loperd/symfony-dockerized
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.1.1
Choose a head ref
  • 2 commits
  • 15 files changed
  • 1 contributor

Commits on Jun 22, 2024

  1. Copy the full SHA
    1ec57ae View commit details
  2. Copy the full SHA
    d0ca11f View commit details
Showing with 1,671 additions and 512 deletions.
  1. +2 −1 .dockerignore
  2. +1 −2 .env
  3. +68 −5 .rr.dev.yaml
  4. +62 −18 .rr.yaml
  5. +2 −1 Makefile
  6. +9 −8 composer.json
  7. +1,363 −439 composer.lock
  8. +0 −3 docker-compose.yml
  9. +55 −17 docker/app/Dockerfile.dev
  10. +54 −3 docker/app/Dockerfile.prod
  11. +7 −6 docker/app/build.sh
  12. +18 −0 docker/app/entry/entrypoint-dev.sh
  13. +30 −0 docker/app/entry/entrypoint-prod.sh
  14. +0 −6 phpunit.xml.dist
  15. +0 −3 symfony.lock
3 changes: 2 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -3,12 +3,13 @@ Makefile
docker*.yml
vendor
var/*
.env.dist
*.log
.gitignore
.gitlab-ci.yml
.editorconfig
.env
.gitlab
.idea
.git
*.local.yml
README.md
3 changes: 1 addition & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
###> symfony/framework-bundle ###
APP_ENV=dev
APP_SECRET=c600b692563f124438a0eae35e6b9604
APP_NAME=symfonydocerized
APP_NAME=symfonydockerized
#TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
#TRUSTED_HOSTS='^localhost|example\.com$'
###< symfony/framework-bundle ###\

73 changes: 68 additions & 5 deletions .rr.dev.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,83 @@
version: "3"
version: '3'

rpc:
listen: tcp://127.0.0.1:6001

server:
# on_init:
# command: "composer install"
# exec_timeout: 3m
command: "php public/index.php"
env:
- APP_RUNTIME: Baldinof\RoadRunnerBundle\Runtime\Runtime

http:
address: 0.0.0.0:8080
address: 0.0.0.0:80
internal_error_code: 505
access_logs: false
max_request_size: 256
raw_body: false
middleware: [ "static", "gzip" ]
pool:
debug: true
uploads:
forbid: [ ".php", ".exe", ".bat" ]
trusted_subnets: [
"10.0.0.0/8",
"127.0.0.0/8",
"172.16.0.0/12",
"192.168.0.0/16",
"::1/128",
"fc00::/7",
"fe80::/10",
]
headers:
cors:
allowed_origin: "*"
allowed_headers: "*"
allowed_methods: "GET,POST,PUT,DELETE"
allow_credentials: true
exposed_headers: "Cache-Control,Content-Language,Content-Type,Expires,Last-Modified,Pragma"
max_age: 600
static:
dir: "public"
forbid: [ ".php", ".htaccess" ]
forbid: [ ".php" ]
calculate_etag: false
weak: false
allow: [ ".txt", ".css", ".js" ]
num_workers: 0
max_jobs: 0
max_queue_size: 0
allocate_timeout: 60s
reset_timeout: 60s
stream_timeout: 60s
destroy_timeout: 60s
supervisor:
watch_tick: 1s
ttl: 0s
idle_ttl: 10s
max_worker_memory: 128
exec_ttl: 60s

metrics:
address: "127.0.0.1:2112"

status:
address: 127.0.0.1:2114
unavailable_status_code: 503

reload:
interval: 1s
patterns: [ ".php" ]
services:
http:
dirs: [ "." ]
recursive: true
ignore: [ "vendor" ]
patterns: [ ".php" ]

endure:
grace_period: 30s
print_graph: false
log_level: error

logs:
mode: development
80 changes: 62 additions & 18 deletions .rr.yaml
Original file line number Diff line number Diff line change
@@ -1,37 +1,81 @@
version: "3"
version: '3'

rpc:
listen: tcp://127.0.0.1:6001

server:
# on_init:
# command: "composer install"
# exec_timeout: 3m
command: "php public/index.php"
env:
- APP_RUNTIME: Baldinof\RoadRunnerBundle\Runtime\Runtime

http:
address: 0.0.0.0:8080
pool:
debug: false
address: 0.0.0.0:80
internal_error_code: 505
access_logs: false
max_request_size: 256
raw_body: false
middleware: [ "static", "gzip" ]
uploads:
forbid: [ ".php", ".exe", ".bat" ]
pool:
debug: true
trusted_subnets: [
"10.0.0.0/8",
"127.0.0.0/8",
"172.16.0.0/12",
"192.168.0.0/16",
"::1/128",
"fc00::/7",
"fe80::/10",
]
headers:
cors:
allowed_origin: "*"
allowed_headers: "*"
allowed_methods: "GET,POST,PUT,DELETE"
allow_credentials: true
exposed_headers: "Cache-Control,Content-Language,Content-Type,Expires,Last-Modified,Pragma"
max_age: 600
static:
dir: "public"
forbid: [ ".php", ".htaccess" ]
forbid: [ ".php" ]
calculate_etag: false
weak: false
allow: [ ".txt", ".css", ".js" ]
num_workers: 0
max_jobs: 0
max_queue_size: 0
allocate_timeout: 60s
reset_timeout: 60s
stream_timeout: 60s
destroy_timeout: 60s
supervisor:
watch_tick: 1s
ttl: 0s
idle_ttl: 10s
max_worker_memory: 128
exec_ttl: 60s

metrics:
address: "127.0.0.1:2112"

status:
address: 127.0.0.1:2114
unavailable_status_code: 503

endure:
grace_period: 30s
print_graph: false
log_level: error

logs:
mode: production
channels:
http:
level: debug # Log all http requests, set to info to disable
level: error
server:
level: info # Everything written to worker stderr is logged
level: info
mode: raw
metrics:
level: error

# Uncomment to use metrics integration
# rpc:
# listen: tcp://127.0.0.1:6001

# Uncomment to use metrics integration
# metrics:
# # prometheus client address (path /metrics added automatically)
# address: "0.0.0.0:9180"
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -61,7 +61,8 @@ test-cover: ## Execute app tests with coverage

up: ## Create and start containers
CURRENT_USER=$(CURRENT_USER) $(dc_bin) up --detach
$(call print_block, 'Navigate your browser to ⇒ https://127.0.0.1:$(FRONTEND_PORT_SSL)')
$(call print_block, 'Navigate your browser to ⇒ http://127.0.0.1:$(FRONTEND_PORT)')
$(call print_block, 'Or navigate your browser to ⇒ https://127.0.0.1:$(FRONTEND_PORT_SSL)')
$(call print_block, 'Redis Manager (Redis Web UI) ⇒ http://127.0.0.1:$(REDIS_MANAGER_PORT)')
$(call print_block, 'Additional ports (available for connections) - Redis ⇒ $(REDIS_PORT); Postgres ⇒ $(POSTGRES_PORT)')

17 changes: 9 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
@@ -6,10 +6,10 @@
"php": "^8.3",
"ext-ctype": "*",
"ext-iconv": "*",
"baldinof/roadrunner-bundle": "^3.0",
"doctrine/annotations": "^1.12",
"baldinof/roadrunner-bundle": "^3.1",
"doctrine/annotations": "^2.0",
"phpdocumentor/type-resolver": "^1.4",
"psr/container": "^1.1",
"psr/container": "^2.0",
"symfony/cache": "^6.4",
"symfony/config": "^6.4",
"symfony/console": "^6.4",
@@ -25,13 +25,13 @@
"symfony/http-kernel": "^6.4",
"symfony/psr-http-message-bridge": "^2",
"symfony/routing": "^6.4",
"symfony/runtime": "^6.4",
"symfony/string": "^6.4",
"symfony/yaml": "^6.4"
},
"require-dev": {
"roave/security-advisories": "dev-latest"
,
"phpunit/phpunit": "^10",
"phpunit/phpunit": "^10.5",
"roave/security-advisories": "dev-latest",
"symfony/var-dumper": "^6.4"
},
"config": {
@@ -40,7 +40,8 @@
},
"sort-packages": true,
"allow-plugins": {
"symfony/flex": true
"symfony/flex": true,
"symfony/runtime": true
}
},
"autoload": {
@@ -80,7 +81,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "5.3.*"
"require": "6.4.*"
}
}
}
Loading