You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: DOCUMENTATION/content/documentation/index.md
+6-6Lines changed: 6 additions & 6 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -201,7 +201,7 @@ More [options](https://docs.docker.com/compose/reference/logs/)
201
201
<aname="Install-PHP-Extensions"></a>
202
202
## Install PHP Extensions
203
203
204
-
Before installing PHP extensions, you have to decide whether you need for the `FPM` or `CLI` because each lives on a different container, if you need it for both you have to edit both containers.
204
+
Before installing PHP extensions, you have to decide first whether you need `FPM` or `CLI`, because each of them has it's own different container, if you need it for both, you have to edit both containers.
205
205
206
206
The PHP-FPM extensions should be installed in `php-fpm/Dockerfile-XX`. *(replace XX with your default PHP version number)*.
207
207
<br>
@@ -428,7 +428,7 @@ To learn more about how Docker publishes ports, please read [this excellent post
428
428
429
429
1) Boot the container `docker-compose up -d jenkins`. To enter the container type `docker-compose exec jenkins bash`.
430
430
431
-
2) Go to `http://localhost:8090/` (if you didn't chanhed your default port mapping)
431
+
2) Go to `http://localhost:8090/` (if you didn't change your default port mapping)
432
432
433
433
3) Authenticate from the web app.
434
434
@@ -971,7 +971,7 @@ docker-compose up -d aws
971
971
972
972
3 - Access the aws container with `docker-compose exec aws bash`
973
973
974
-
4 - To start using eb cli inside the container, initiaze your project first by doing 'eb init'. Read the [aws eb cli](http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/eb-cli3-configuration.html) docs for more details.
974
+
4 - To start using eb cli inside the container, initialize your project first by doing 'eb init'. Read the [aws eb cli](http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/eb-cli3-configuration.html) docs for more details.
975
975
976
976
977
977
@@ -989,7 +989,7 @@ docker-compose up -d grafana
989
989
990
990
3 - Open your browser and visit the localhost on port **3000** at the following URL: `http://localhost:3000`
991
991
992
-
4 - Login using the credentials User = `admin` Passwort = `admin`. Change the password in the webinterface if you want to.
992
+
4 - Login using the credentials User = `admin`, Password = `admin`. Change the password in the web interface if you want to.
993
993
994
994
995
995
@@ -1525,7 +1525,7 @@ Quick Setup giude, (we recommend you check their docs)
1525
1525
<aname="Docker-Sync"></a>
1526
1526
### Workaround B: using d4m-nfs
1527
1527
1528
-
You can use the d4m-nfs solution in 2 ways, one is using the Laradock built it integration, and the other is using the tool separatly. Below is show case of both methods:
1528
+
You can use the d4m-nfs solution in 2 ways, the first is by using the built-in Laradock integration, and the second is using the tool separately. Below is show case of both methods:
1529
1529
1530
1530
1531
1531
### B.1: using the built in d4m-nfs integration
@@ -1630,7 +1630,7 @@ Click on the Docker Icon > Preferences > (remove everything form the list except
Copy file name to clipboardExpand all lines: DOCUMENTATION/content/getting-started/index.md
+5-5Lines changed: 5 additions & 5 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -161,21 +161,21 @@ We recommend using a Docker version which is newer than 1.13.
161
161
cp env-example .env
162
162
```
163
163
164
-
You can edit the `.env` file to choose which software's you want to be installed in your environment. You can always refer to the `docker-compose.yml` file to see how those variables are been used.
164
+
You can edit the `.env` file to choose which software you want to be installed in your environment. You can always refer to the `docker-compose.yml` file to see how those variables have been used.
165
165
166
166
Depending on the host's operating system you may need to change the value given to `COMPOSE_FILE`. When you are running Laradock on Mac OS the correct file separator to use is `:`. When running Laradock from a Windows environment multiple files must be separated with `;`.
167
167
168
-
By default the containers that will be created have the current directory name as suffix (e.g. `laradock_workspace_1`). This can cause mixture of data inside the container volumes if you use laradock in multiple project. In this case, either read the guide for [multiple projects](#B) or change the variable `COMPOSE_PROJECT_NAME` to something unique like your project name.
168
+
By default the containers that will be created have the current directory name as suffix (e.g. `laradock_workspace_1`). This can cause mixture of data inside the container volumes if you use laradock in multiple projects. In this case, either read the guide for [multiple projects](#B) or change the variable `COMPOSE_PROJECT_NAME` to something unique like your project name.
169
169
170
-
2 - Build the enviroment and run it using `docker-compose`
170
+
2 - Build the environment and run it using `docker-compose`
171
171
172
172
In this example we'll see how to run NGINX (web server) and MySQL (database engine) to host a PHP Web Scripts:
173
173
174
174
```bash
175
175
docker-compose up -d nginx mysql
176
176
```
177
177
178
-
**Note**: The web servers `nginx`, `apache`.. all depend on `php-fpm`, means if you just run, them they will automatically run the `php-fpm` for you, so no need to specify them in the `up` command. If you don't see them running then you may need run them as follow: `docker-compose up -d nginx php-fpm mysql...`.
178
+
**Note**: All the web server containers `nginx`, `apache` ..etc depends on `php-fpm`, which means if you run any of them, they will automatically launch the `php-fpm`container for you, so no need to explicitly specify it in the `up` command. If you have to do so, you may need to run them as follows: `docker-compose up -d nginx php-fpm mysql`.
179
179
180
180
181
181
You can select your own combination of containers from [this list](http://laradock.io/introduction/#supported-software-images).
If you want to install Jenkins behind a reverse proxy with prefix, example: mysite.com/jenkins, you need to add environnement variable `JENKINS_OPTS="--prefix=/jenkins"` and then follow the below procedures to configure your reverse proxy, which will depend if you have Apache ou Nginx:
96
+
If you want to install Jenkins behind a reverse proxy with prefix, example: mysite.com/jenkins, you need to add environment variable `JENKINS_OPTS="--prefix=/jenkins"` and then follow the below procedures to configure your reverse proxy, which will depend if you have Apache ou Nginx:
0 commit comments