Merge pull request #358 from appleboy/patch-22

convert tab to spaces.
This commit is contained in:
Mahmoud Zalt 2016-10-11 12:49:43 -04:00 committed by GitHub
commit a2847316c4

View File

@ -421,15 +421,17 @@ Examples:
Change MySQL Database Name: Change MySQL Database Name:
```yml ```yml
environment: environment:
MYSQL_DATABASE: laradock MYSQL_DATABASE: laradock
...
``` ```
Change Redis defaut port to 1111: Change Redis defaut port to 1111:
```yml ```yml
ports: ports:
- "1111:6379" - "1111:6379"
...
``` ```
@ -548,6 +550,7 @@ Since the new Laravel application is in the `my-cool-app` folder, we need to rep
build: ./application build: ./application
volumes: volumes:
- ../my-cool-app/:/var/www/laravel - ../my-cool-app/:/var/www/laravel
...
``` ```
4 - Go to that folder and start working.. 4 - Go to that folder and start working..
@ -824,11 +827,12 @@ By default **PHP-FPM 7.0** is running.
3 - Change the version number, by replacing `Dockerfile-70` with `Dockerfile-56`, like this: 3 - Change the version number, by replacing `Dockerfile-70` with `Dockerfile-56`, like this:
```txt ```yml
php-fpm: php-fpm:
build: build:
context: ./php-fpm context: ./php-fpm
dockerfile: Dockerfile-70 dockerfile: Dockerfile-70
...
``` ```
4 - Finally rebuild the container 4 - Finally rebuild the container
@ -994,12 +998,12 @@ To change the timezone for the `workspace` container, modify the `TZ` build argu
For example, if I want the timezone to be `New York`: For example, if I want the timezone to be `New York`:
```yml ```yml
workspace: workspace:
build: build:
context: ./workspace context: ./workspace
args: args:
- TZ=America/New_York - TZ=America/New_York
... ...
``` ```
We also recommend [setting the timezone in Laravel](http://www.camroncade.com/managing-timezones-with-laravel/). We also recommend [setting the timezone in Laravel](http://www.camroncade.com/managing-timezones-with-laravel/).