Skip to content

Commit

Permalink
Merge pull request #34 from humpbackdev/feature/add-blackfire-config
Browse files Browse the repository at this point in the history
Added blackfire
  • Loading branch information
rigoucr authored Oct 2, 2018
2 parents d9f9692 + f16ae63 commit f56a0c9
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
1 change: 1 addition & 0 deletions .ahoy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ commands:

up:
cmd: |
source .env
docker network create humpback_proxy &> /dev/null
ahoy docker proxy-up
docker-compose up -d
Expand Down
12 changes: 11 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:
- './mysql:/etc/mysql/conf.d'

php:
image: kporras07/docker-php:v1.4
image: kporras07/docker-php:v1.5
environment:
- PHP_POST_MAX_SIZE=${PHP_POST_MAX_SIZE}
- PHP_UPLOAD_MAX_FILESIZE=${PHP_UPLOAD_MAX_FILESIZE}
Expand All @@ -43,6 +43,7 @@ services:
- db
- solr
- memcached
- blackfire
volumes:
- "./:/var/www/html:delegated"
networks:
Expand Down Expand Up @@ -153,6 +154,15 @@ services:
- 'traefik.frontend.rule=Host:mailhog.${VIRTUAL_HOST-localhost}'
- 'traefik.docker.network=humpback_proxy'
- 'traefik.port=8025'
blackfire:
image: blackfire/blackfire:1.18.0
environment:
- BLACKFIRE_SERVER_ID=${BLACKFIRE_SERVER_ID}
- BLACKFIRE_SERVER_TOKEN=${BLACKFIRE_SERVER_TOKEN}
expose:
- "8707"
networks:
- internal
volumes:
humpback_database: {}
networks:
Expand Down
2 changes: 2 additions & 0 deletions env.example
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ VIRTUAL_HOST=humpback.docker
CONTAINER_UID=1000
PHP_POST_MAX_SIZE=100M
PHP_UPLOAD_MAX_FILESIZE=100M
BLACKFIRE_SERVER_ID=[COMPLETE ME]
BLACKFIRE_SERVER_TOKEN=[COMPLETE ME]

0 comments on commit f56a0c9

Please sign in to comment.