Skip to content

Commit

Permalink
Merge branch 'master' into coding-standard
Browse files Browse the repository at this point in the history
  • Loading branch information
Ravan Scafi committed Oct 18, 2018
2 parents de412eb + b46fafd commit c3c2efd
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 15 deletions.
19 changes: 5 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,23 +1,14 @@
sniff:
vendor/bin/phpcs
docker-compose run --rm php vendor/bin/phpcs

phpunit:
vendor/bin/phpunit
docker-compose run --rm php vendor/bin/phpunit

coverage:
vendor/bin/phpunit --coverage-html ./.coverage

MKDOCS := $(shell mkdocs -V)
docker-compose run --rm php vendor/bin/phpunit --coverage-html ./.coverage

mkdocs:
ifndef MKDOCS
pip install mkdocs
endif
mkdocs build --clean

SAMI := $(shell vendor/bin/sami.php -V)
docker-compose run --rm mkdocs mkdocs build --clean

mkapi:
ifdef SAMI
vendor/bin/sami.php update sami.php; exit 0
endif
docker-compose run --rm php vendor/bin/sami.php update sami.php
1 change: 1 addition & 0 deletions docker-compose.override.yml.example
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version: '3'
25 changes: 25 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
version: '3'

services:
php:
image: leroymerlinbr/php
depends_on:
- db
volumes:
- .:/var/www/html

db:
image: mongo:4.0
command: mongod --smallfiles
volumes:
- db:/data/db
- .:/var/www/html

mkdocs:
image: polinux/mkdocs
volumes:
- .:/workdir/mkdocs

volumes:
db:
driver: local
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ repo_url: https://github.com/leroy-merlin-br/mongolid

theme: readthedocs

pages:
nav:
- 'Home': 'index.md'
- 'Basics': 'basics.md'
- 'Relationships': 'relationships.md'
Expand Down

0 comments on commit c3c2efd

Please sign in to comment.