ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1115 from joaorobertopb/patch-1 

Changes to correct version of dockerfile
This commit is contained in:
Mahmoud Zalt 2017-08-30 01:07:37 +03:00 committed by GitHub
parent a1d3eeb7e6 f800a3221a
commit fdcf9117ac
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DOCUMENTATION/content/documentation/index.md
View File

@ -232,7 +232,7 @@ By default **PHP-FPM 7.0** is running.
php-fpm: php-fpm:
build: build:
context: ./php-fpm context: ./php-fpm
dockerfile: Dockerfile-70 dockerfile: Dockerfile-56
... ...
``` ```
@ -331,7 +331,7 @@ For information on how to configure xDebug with your IDE and work it out, check
<a name="Setup remote debugging for PhpStorm on Linux"></a> <a name="Setup remote debugging for PhpStorm on Linux"></a>
## Setup remote debugging for PhpStorm on Linux ## Setup remote debugging for PhpStorm on Linux
- Make sure you have followed the steps above in the [Install Xdebug section](http://laradock.io/documentation/#install-xdebug). - Make sure you have followed the steps above in the [Install Xdebug section](http://laradock.io/documentation/#install-xdebug).
- Make sure Xdebug accepts connections and listens on port 9000. (Should be default configuration). - Make sure Xdebug accepts connections and listens on port 9000. (Should be default configuration).
@ -946,7 +946,7 @@ To install CodeIgniter 3 on Laradock all you have to do is the following simple
<a name="Install-Symfony"></a> <a name="Install-Symfony"></a>
## Install Symfony ## Install Symfony
1 - Open the `.env` file and set `WORKSPACE_INSTALL_SYMFONY` to `true`. 1 - Open the `.env` file and set `WORKSPACE_INSTALL_SYMFONY` to `true`.
2 - Run `docker-compose build workspace`, after the step above. 2 - Run `docker-compose build workspace`, after the step above.
@ -1449,7 +1449,7 @@ You can use the d4m-nfs solution in 2 ways, one is using the Laradock built it i
#### B.1: using the built in d4m-nfs integration #### B.1: using the built in d4m-nfs integration
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. 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.
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. 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.
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` 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
```bash ```bash
./sync.sh install ./sync.sh install
``` ```
3) Start docker-sync and the Laradock environment. 3) Start docker-sync and the Laradock environment.
Specify the services you want to run, as you would normally do with `docker-compose up` Specify the services you want to run, as you would normally do with `docker-compose up`
```bash ```bash
./sync.sh up nginx mysql ./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
##### Setting up Aliases (optional) ##### Setting up Aliases (optional)
You may create bash profile aliases to avoid having to remember and type these commands for everyday development. You may create bash profile aliases to avoid having to remember and type these commands for everyday development.
Add the following lines to your `~/.bash_profile`: Add the following lines to your `~/.bash_profile`:
```bash ```bash
@ -1495,11 +1495,11 @@ alias devbash="cd /PATH_TO_LARADOCK/laradock; ./sync.sh bash"
alias devdown="cd /PATH_TO_LARADOCK/laradock; ./sync.sh down" alias devdown="cd /PATH_TO_LARADOCK/laradock; ./sync.sh down"
``` ```
Now from any location on your machine, you can simply run `devup`, `devbash` and `devdown`. Now from any location on your machine, you can simply run `devup`, `devbash` and `devdown`.
##### Additional Commands ##### Additional Commands
Opening bash on the workspace container (to run artisan for example): Opening bash on the workspace container (to run artisan for example):
```bash ```bash
./sync.sh bash ./sync.sh bash
@ -1516,7 +1516,7 @@ Removing and cleaning up the files and the docker-sync container. Use only if yo
##### Additional Notes ##### Additional Notes
- 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. - 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.
- You may inspect the `sync.sh` script to learn each of the commands and even add custom ones. - You may inspect the `sync.sh` script to learn each of the commands and even add custom ones.
- 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. - 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.