Skip to content

Commit fdcf911

Browse files
authored
Merge pull request laradock#1115 from joaorobertopb/patch-1
Changes to correct version of dockerfile
2 parents a1d3eeb + f800a32 commit fdcf911

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

  • DOCUMENTATION/content/documentation

DOCUMENTATION/content/documentation/index.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ By default **PHP-FPM 7.0** is running.
232232
php-fpm:
233233
build:
234234
context: ./php-fpm
235-
dockerfile: Dockerfile-70
235+
dockerfile: Dockerfile-56
236236
...
237237
```
238238

@@ -331,7 +331,7 @@ For information on how to configure xDebug with your IDE and work it out, check
331331
<a name="Setup remote debugging for PhpStorm on Linux"></a>
332332
## Setup remote debugging for PhpStorm on Linux
333333

334-
- Make sure you have followed the steps above in the [Install Xdebug section](http://laradock.io/documentation/#install-xdebug).
334+
- Make sure you have followed the steps above in the [Install Xdebug section](http://laradock.io/documentation/#install-xdebug).
335335

336336
- Make sure Xdebug accepts connections and listens on port 9000. (Should be default configuration).
337337

@@ -946,7 +946,7 @@ To install CodeIgniter 3 on Laradock all you have to do is the following simple
946946
<a name="Install-Symfony"></a>
947947
## Install Symfony
948948

949-
1 - Open the `.env` file and set `WORKSPACE_INSTALL_SYMFONY` to `true`.
949+
1 - Open the `.env` file and set `WORKSPACE_INSTALL_SYMFONY` to `true`.
950950

951951
2 - Run `docker-compose build workspace`, after the step above.
952952

@@ -1449,7 +1449,7 @@ You can use the d4m-nfs solution in 2 ways, one is using the Laradock built it i
14491449

14501450
#### B.1: using the built in d4m-nfs integration
14511451

1452-
In simple terms, docker-sync creates a docker container with a copy of all the application files that can be accessed very quickly from the other containers.
1452+
In simple terms, docker-sync creates a docker container with a copy of all the application files that can be accessed very quickly from the other containers.
14531453
On the other hand, docker-sync runs a process on the host machine that continuously tracks and updates files changes from the host to this intermediate container.
14541454

14551455
Out of the box, it comes pre-configured for OS X, but using it on Windows is very easy to set-up by modifying the `DOCKER_SYNC_STRATEGY` on the `.env`
@@ -1473,7 +1473,7 @@ DOCKER_SYNC_STRATEGY=native_osx
14731473
```bash
14741474
./sync.sh install
14751475
```
1476-
3) Start docker-sync and the Laradock environment.
1476+
3) Start docker-sync and the Laradock environment.
14771477
Specify the services you want to run, as you would normally do with `docker-compose up`
14781478
```bash
14791479
./sync.sh up nginx mysql
@@ -1486,7 +1486,7 @@ Please note that the first time docker-sync runs, it will copy all the files to
14861486

14871487
##### Setting up Aliases (optional)
14881488

1489-
You may create bash profile aliases to avoid having to remember and type these commands for everyday development.
1489+
You may create bash profile aliases to avoid having to remember and type these commands for everyday development.
14901490
Add the following lines to your `~/.bash_profile`:
14911491

14921492
```bash
@@ -1495,11 +1495,11 @@ alias devbash="cd /PATH_TO_LARADOCK/laradock; ./sync.sh bash"
14951495
alias devdown="cd /PATH_TO_LARADOCK/laradock; ./sync.sh down"
14961496
```
14971497

1498-
Now from any location on your machine, you can simply run `devup`, `devbash` and `devdown`.
1498+
Now from any location on your machine, you can simply run `devup`, `devbash` and `devdown`.
14991499

15001500

15011501
##### Additional Commands
1502-
1502+
15031503
Opening bash on the workspace container (to run artisan for example):
15041504
```bash
15051505
./sync.sh bash
@@ -1516,7 +1516,7 @@ Removing and cleaning up the files and the docker-sync container. Use only if yo
15161516

15171517
##### Additional Notes
15181518

1519-
- You may run laradock with or without docker-sync at any time using with the same `.env` and `docker-compose.yml`, because the configuration is overridden automatically when docker-sync is used.
1519+
- You may run laradock with or without docker-sync at any time using with the same `.env` and `docker-compose.yml`, because the configuration is overridden automatically when docker-sync is used.
15201520
- You may inspect the `sync.sh` script to learn each of the commands and even add custom ones.
15211521
- If a container cannot access the files on docker-sync, you may need to set a user on the Dockerfile of that container with an id of 1000 (this is the UID that nginx and php-fpm have configured on laradock). Alternatively, you may change the permissions to 777, but this is **not** recommended.
15221522

0 commit comments

Comments
 (0)