Skip to content

Commit

Permalink
Merge pull request matchish#99 from matchish/chore
Browse files Browse the repository at this point in the history
Chore
  • Loading branch information
matchish authored Mar 14, 2020
2 parents 2320873 + 9929b10 commit 6683500
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
9 changes: 9 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
APP_ENV=development
XDEBUG_CONFIG=remote_port=9001 remote_host=172.17.0.1 remote_autostart=1 remote_log=/home/user/xdebug.log
PHP_IDE_CONFIG=serverName=Scout
ELASTICSEARCH_HOST=elasticsearch:9200
DB_HOST=db
DB_PORT=3306
DB_DATABASE=my_database
DB_USERNAME=root
DB_PASSWORD=my_password
5 changes: 5 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ Contributions are welcome, and are accepted via pull requests. Please review the
* Please remember that we follow [SemVer](http://semver.org/).

We have [StyleCI](https://styleci.io/) setup to automatically fix any code style issues.

# Running tests

Run `make install` to prepare docker containers for tests
Run tests `make test`
2 changes: 1 addition & 1 deletion docker/app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN ln -snf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime && echo ${TIMEZONE} >
RUN printf '[PHP]\ndate.timezone = "%s"\n', ${TIMEZONE} > /usr/local/etc/php/conf.d/tzone.ini
RUN "date"

RUN apt-get update && apt-get install -y libmcrypt-dev mysql-client \
RUN apt-get update && apt-get install -y libmcrypt-dev mariadb-client \
&& docker-php-ext-install pdo_mysql

FROM php as php-development
Expand Down

0 comments on commit 6683500

Please sign in to comment.