Skip to content

Commit

Permalink
Merge pull request #32 from humpbackdev/feature/52-php-max-limits
Browse files Browse the repository at this point in the history
52: PHP File max limits.
  • Loading branch information
kporras07 authored Sep 13, 2018
2 parents 65486b4 + 8a16ac7 commit a47ecfa
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ before_install:
- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
script:
- sudo wget -q https://github.com/ahoy-cli/ahoy/releases/download/2.0.0/ahoy-bin-linux-amd64 -O /usr/local/bin/ahoy && sudo chown $USER /usr/local/bin/ahoy && chmod +x /usr/local/bin/ahoy
- cp env.example .env
- ahoy up
- docker-compose up -d
5 changes: 4 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ services:
- './mysql:/etc/mysql/conf.d'

php:
image: kporras07/docker-php:v1.3
image: kporras07/docker-php:v1.4
environment:
- PHP_POST_MAX_SIZE=${PHP_POST_MAX_SIZE}
- PHP_UPLOAD_MAX_FILESIZE=${PHP_UPLOAD_MAX_FILESIZE}
user: "${CONTAINER_UID}"
expose:
- "9000"
Expand Down
2 changes: 2 additions & 0 deletions env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
## Copy this file to .env and change VIRTUAL_HOST value to what you want.
VIRTUAL_HOST=humpback.docker
CONTAINER_UID=1000
PHP_POST_MAX_SIZE=100M
PHP_UPLOAD_MAX_FILESIZE=100M
2 changes: 2 additions & 0 deletions nginx/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ server {
server_name localhost;
root /var/www/html/web; ## <-- Your only path reference.

client_max_body_size 100m;

location = /favicon.ico {
log_not_found off;
access_log off;
Expand Down

0 comments on commit a47ecfa

Please sign in to comment.