Various readme typo fixes/improvements (#593)
* Various readme typo fixes/improvements * Change Laradock -> LaraDock
This commit is contained in:
parent
e8bb2b29fd
commit
00550d328c
@ -38,9 +38,9 @@ You can request a new feature by submitting an [Issue](https://github.com/larado
|
|||||||
* Edit the files you want to update.
|
* Edit the files you want to update.
|
||||||
|
|
||||||
* **Note:** If you want to edit the base image of the `Workspace` or the `php-fpm` Containers,
|
* **Note:** If you want to edit the base image of the `Workspace` or the `php-fpm` Containers,
|
||||||
you need to edit their Dockerfiles from their Github repositories. For more info read their Dockerfiles comment on the LaraDock repository.
|
you need to edit their Dockerfiles from their GitHub repositories. For more info read their Dockerfiles comment on the LaraDock repository.
|
||||||
|
|
||||||
* Make sure to update the `Readme` incase you made any changes.
|
* Make sure to update the `Readme` in case you made any changes.
|
||||||
|
|
||||||
## Issue/PR Submission Guidelines
|
## Issue/PR Submission Guidelines
|
||||||
|
|
||||||
@ -68,7 +68,7 @@ Always Test everything and make sure its working:
|
|||||||
### Submitting a PR
|
### Submitting a PR
|
||||||
Consider the following guidelines:
|
Consider the following guidelines:
|
||||||
|
|
||||||
* Search [GitHub](https://github.com/LaraDock/laradock/pulls) for an open or closed Pull Request that relates to your submission. You don't want to duplicate effort.
|
* Search [GitHub](https://github.com/laradock/laradock/pulls) for an open or closed Pull Request that relates to your submission. You don't want to duplicate effort.
|
||||||
|
|
||||||
* Make your changes in a new git branch:
|
* Make your changes in a new git branch:
|
||||||
|
|
||||||
|
18
README-zh.md
18
README-zh.md
@ -67,7 +67,7 @@ LaraDock努力简化创建开发环境过程。
|
|||||||
|
|
||||||
1. 将LaraDock放到你的Laravel项目中:
|
1. 将LaraDock放到你的Laravel项目中:
|
||||||
<br>
|
<br>
|
||||||
`git clone https://github.com/LaraDock/laradock.git`.
|
`git clone https://github.com/laradock/laradock.git`.
|
||||||
2. 进入LaraDock目录,然后运行这些容器。
|
2. 进入LaraDock目录,然后运行这些容器。
|
||||||
<br>
|
<br>
|
||||||
`docker-compose up -d nginx mysql redis`
|
`docker-compose up -d nginx mysql redis`
|
||||||
@ -177,7 +177,7 @@ Homestead 是一个工具,为你控制虚拟机(使用Homestead特殊命令)。V
|
|||||||
**A)** 如果你已经有一个Laravel项目,克隆这个仓库在到`Laravel`根目录
|
**A)** 如果你已经有一个Laravel项目,克隆这个仓库在到`Laravel`根目录
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git submodule add https://github.com/LaraDock/laradock.git
|
git submodule add https://github.com/laradock/laradock.git
|
||||||
```
|
```
|
||||||
>如果你不是使用Git管理Laravel项目,您可以使用 `git clone` 而不是`git submodule`。
|
>如果你不是使用Git管理Laravel项目,您可以使用 `git clone` 而不是`git submodule`。
|
||||||
|
|
||||||
@ -185,7 +185,7 @@ git submodule add https://github.com/LaraDock/laradock.git
|
|||||||
**B)** 如果你没有一个Laravel项目,你想Docker安装Laravel,克隆这个源在您的机器任何地方上:
|
**B)** 如果你没有一个Laravel项目,你想Docker安装Laravel,克隆这个源在您的机器任何地方上:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git clone https://github.com/LaraDock/laradock.git
|
git clone https://github.com/laradock/laradock.git
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
@ -196,8 +196,8 @@ git clone https://github.com/LaraDock/laradock.git
|
|||||||
|
|
||||||
**请在开始之前阅读:**
|
**请在开始之前阅读:**
|
||||||
如果你正在使用**Docker Toolbox** (VM),选择以下任何一个方法:
|
如果你正在使用**Docker Toolbox** (VM),选择以下任何一个方法:
|
||||||
- 更新到Docker [Native](https://www.docker.com/products/docker) Mac/Windows版本 (建议). 查看 [Upgrading Laradock](#upgrading-laradock)
|
- 更新到Docker [Native](https://www.docker.com/products/docker) Mac/Windows版本 (建议). 查看 [Upgrading LaraDock](#upgrading-laradock)
|
||||||
- 使用 LaraDock v3.* (访问 `LaraDock-ToolBox` [分支](https://github.com/LaraDock/laradock/tree/LaraDock-ToolBox)).
|
- 使用 LaraDock v3.* (访问 `LaraDock-ToolBox` [分支](https://github.com/laradock/laradock/tree/LaraDock-ToolBox)).
|
||||||
如果您使用的是**Docker Native**(Mac / Windows版本)甚至是Linux版本,通常可以继续阅读这个文档,LaraDock v4以上版本将仅支持**Docker Native**。
|
如果您使用的是**Docker Native**(Mac / Windows版本)甚至是Linux版本,通常可以继续阅读这个文档,LaraDock v4以上版本将仅支持**Docker Native**。
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
@ -720,7 +720,7 @@ docker-compose build php
|
|||||||
#### B) 切换版本 PHP `7.0` 或 `5.6` 到 PHP `5.5`
|
#### B) 切换版本 PHP `7.0` 或 `5.6` 到 PHP `5.5`
|
||||||
我们已不在本地支持PHP5.5,但是你按照以下步骤获取:
|
我们已不在本地支持PHP5.5,但是你按照以下步骤获取:
|
||||||
|
|
||||||
1 - 克隆 `https://github.com/LaraDock/php-fpm`.
|
1 - 克隆 `https://github.com/laradock/php-fpm`.
|
||||||
|
|
||||||
3 - 重命名 `Dockerfile-56` 为 `Dockerfile-55`.
|
3 - 重命名 `Dockerfile-56` 为 `Dockerfile-55`.
|
||||||
|
|
||||||
@ -938,7 +938,7 @@ sudo chmod -R 777 storage bootstrap/cache
|
|||||||
## 贡献
|
## 贡献
|
||||||
这个小项目是由一个有一个全职工作和很多的职责的人建立的,所以如果你喜欢这个项目,并且发现它需要一个bug修复或支持或新软件或升级任何容器,或其他任何. . 你是非常欢迎,欢迎毫不不犹豫地贡献吧:)
|
这个小项目是由一个有一个全职工作和很多的职责的人建立的,所以如果你喜欢这个项目,并且发现它需要一个bug修复或支持或新软件或升级任何容器,或其他任何. . 你是非常欢迎,欢迎毫不不犹豫地贡献吧:)
|
||||||
|
|
||||||
#### 阅读我们的 [贡献说明](https://github.com/LaraDock/laradock/blob/master/CONTRIBUTING.md)
|
#### 阅读我们的 [贡献说明](https://github.com/laradock/laradock/blob/master/CONTRIBUTING.md)
|
||||||
|
|
||||||
<a name="Help"></a>
|
<a name="Help"></a>
|
||||||
## 帮助 & 问题
|
## 帮助 & 问题
|
||||||
@ -957,8 +957,8 @@ Docker或Laravel的特别帮助,你可以在[Codementor.io](https://www.codeme
|
|||||||
|
|
||||||
**优秀的人:**
|
**优秀的人:**
|
||||||
|
|
||||||
- [Contributors](https://github.com/LaraDock/laradock/graphs/contributors)
|
- [Contributors](https://github.com/laradock/laradock/graphs/contributors)
|
||||||
- [Supporters](https://github.com/LaraDock/laradock/issues?utf8=%E2%9C%93&q=)
|
- [Supporters](https://github.com/laradock/laradock/issues?utf8=%E2%9C%93&q=)
|
||||||
|
|
||||||
|
|
||||||
## 许可证
|
## 许可证
|
||||||
|
116
README.md
116
README.md
@ -1,10 +1,10 @@
|
|||||||
# Laradock
|
# LaraDock
|
||||||
|
|
||||||
[![forthebadge](http://forthebadge.com/images/badges/built-by-developers.svg)](http://zalt.me)
|
[![forthebadge](http://forthebadge.com/images/badges/built-by-developers.svg)](http://zalt.me)
|
||||||
|
|
||||||
[![Gitter](https://badges.gitter.im/LaraDock/laradock.svg)](https://gitter.im/LaraDock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
|
[![Gitter](https://badges.gitter.im/LaraDock/laradock.svg)](https://gitter.im/LaraDock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
|
||||||
|
|
||||||
Laradock is a Docker PHP development environment. It facilitate running **PHP** Apps on **Docker**.
|
LaraDock is a Docker PHP development environment. It facilitate running **PHP** Apps on **Docker**.
|
||||||
|
|
||||||
>Use Docker first and learn about it later.
|
>Use Docker first and learn about it later.
|
||||||
|
|
||||||
@ -16,11 +16,11 @@ Laradock is a Docker PHP development environment. It facilitate running **PHP**
|
|||||||
<a name="Intro"></a>
|
<a name="Intro"></a>
|
||||||
## Intro
|
## Intro
|
||||||
|
|
||||||
Laradock strives to make the PHP development experience easier and faster.
|
LaraDock strives to make the PHP development experience easier and faster.
|
||||||
|
|
||||||
It contains pre-packaged Docker Images that provides you a wonderful *development* environment without requiring you to install PHP, NGINX, MySQL, REDIS, and any other software on your machines.
|
It contains pre-packaged Docker Images that provides you a wonderful *development* environment without requiring you to install PHP, NGINX, MySQL, Redis, and any other software on your machines.
|
||||||
|
|
||||||
Laradock is configured to run Laravel Apps by default, and it can be modified to run all kinds of PHP Apps (Symfony, CodeIgniter, Wordpress, Drupal...).
|
LaraDock is configured to run Laravel Apps by default, and it can be modified to run all kinds of PHP Apps (Symfony, CodeIgniter, WordPress, Drupal...).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -31,13 +31,13 @@ Laradock is configured to run Laravel Apps by default, and it can be modified to
|
|||||||
|
|
||||||
- [Readme Languages](#)
|
- [Readme Languages](#)
|
||||||
- [English (Default)](#)
|
- [English (Default)](#)
|
||||||
- [Chinese](https://github.com/LaraDock/laradock/blob/master/README-zh.md)
|
- [Chinese](https://github.com/laradock/laradock/blob/master/README-zh.md)
|
||||||
- [Intro](#Intro)
|
- [Intro](#Intro)
|
||||||
- [Features](#features)
|
- [Features](#features)
|
||||||
- [Supported Software](#Supported-Containers)
|
- [Supported Software](#Supported-Containers)
|
||||||
- [What is Docker](#what-is-docker)
|
- [What is Docker](#what-is-docker)
|
||||||
- [Why Docker not Vagrant](#why-docker-not-vagrant)
|
- [Why Docker not Vagrant](#why-docker-not-vagrant)
|
||||||
- [Laradock VS Homestead](#laradock-vs-homestead)
|
- [LaraDock VS Homestead](#laradock-vs-homestead)
|
||||||
- [Demo Video](#Demo)
|
- [Demo Video](#Demo)
|
||||||
- [Requirements](#Requirements)
|
- [Requirements](#Requirements)
|
||||||
- [Installation](#Installation)
|
- [Installation](#Installation)
|
||||||
@ -79,7 +79,7 @@ Laradock is configured to run Laravel Apps by default, and it can be modified to
|
|||||||
- [Install CodeIgniter](#Install-CodeIgniter)
|
- [Install CodeIgniter](#Install-CodeIgniter)
|
||||||
- [Misc](#Misc)
|
- [Misc](#Misc)
|
||||||
- [Change the timezone](#Change-the-timezone)
|
- [Change the timezone](#Change-the-timezone)
|
||||||
- [Cron jobs](#CronJobs)
|
- [Adding cron jobs](#CronJobs)
|
||||||
- [Access workspace via ssh](#Workspace-ssh)
|
- [Access workspace via ssh](#Workspace-ssh)
|
||||||
- [MySQL access from host](#MySQL-access-from-host)
|
- [MySQL access from host](#MySQL-access-from-host)
|
||||||
- [MySQL root access](#MySQL-root-access)
|
- [MySQL root access](#MySQL-root-access)
|
||||||
@ -94,7 +94,7 @@ Laradock is configured to run Laravel Apps by default, and it can be modified to
|
|||||||
- [Install Aerospike extension](#Install-Aerospike-Extension)
|
- [Install Aerospike extension](#Install-Aerospike-Extension)
|
||||||
- [Install Laravel Envoy](#Install-Laravel-Envoy)
|
- [Install Laravel Envoy](#Install-Laravel-Envoy)
|
||||||
- [PHPStorm Debugging Guide](#phpstorm-debugging)
|
- [PHPStorm Debugging Guide](#phpstorm-debugging)
|
||||||
- [Keep track of your Laradock changes](#keep-tracking-Laradock)
|
- [Keep track of your LaraDock changes](#keep-tracking-LaraDock)
|
||||||
- [Upgrading LaraDock](#upgrading-laradock)
|
- [Upgrading LaraDock](#upgrading-laradock)
|
||||||
- [Common Problems](#Common-Problems)
|
- [Common Problems](#Common-Problems)
|
||||||
- [Related Projects](#related-projects)
|
- [Related Projects](#related-projects)
|
||||||
@ -106,9 +106,9 @@ Laradock is configured to run Laravel Apps by default, and it can be modified to
|
|||||||
|
|
||||||
### Quick Overview:
|
### Quick Overview:
|
||||||
|
|
||||||
Let's see how easy it is to install `NGINX`, `PHP`, `Composer`, `MySQL`, `Redis` and `Beanstalkd`:
|
Let's see how easy it is to install `NGINX`, `PHP`, `Composer`, `MySQL`, `Redis` and `beanstalkd`:
|
||||||
|
|
||||||
1 - Clone Laradock inside your PHP project:
|
1 - Clone LaraDock inside your PHP project:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
git clone https://github.com/Laradock/laradock.git
|
git clone https://github.com/Laradock/laradock.git
|
||||||
@ -128,7 +128,7 @@ REDIS_HOST=redis
|
|||||||
QUEUE_HOST=beanstalkd
|
QUEUE_HOST=beanstalkd
|
||||||
```
|
```
|
||||||
|
|
||||||
4 - Open your browser and visi localhost: `http://localhost`.
|
4 - Open your browser and visit localhost: `http://localhost`.
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
That's it! enjoy :)
|
That's it! enjoy :)
|
||||||
@ -145,11 +145,11 @@ That's it! enjoy :)
|
|||||||
- Choose your favorite database engine: MySQL, Postgres, MariaDB...
|
- Choose your favorite database engine: MySQL, Postgres, MariaDB...
|
||||||
- Run your own combination of software: Memcached, HHVM, Beanstalkd...
|
- Run your own combination of software: Memcached, HHVM, Beanstalkd...
|
||||||
- Every software runs on a separate container: PHP-FPM, NGINX, PHP-CLI...
|
- Every software runs on a separate container: PHP-FPM, NGINX, PHP-CLI...
|
||||||
- Easy to customize any container, with simple edit to the `dockerfile`.
|
- Easy to customize any container, with simple edit to the `Dockerfile`.
|
||||||
- All Images extends from an official base Image. (Trusted base Images).
|
- All Images extends from an official base Image. (Trusted base Images).
|
||||||
- Pre-configured Nginx for Laravel.
|
- Pre-configured NGINX for Laravel.
|
||||||
- Easy to apply configurations inside containers.
|
- Easy to apply configurations inside containers.
|
||||||
- Clean and well structured Dockerfiles (`dockerfile`).
|
- Clean and well structured Dockerfiles (`Dockerfile`).
|
||||||
- Latest version of the Docker Compose file (`docker-compose`).
|
- Latest version of the Docker Compose file (`docker-compose`).
|
||||||
- Everything is visible and editable.
|
- Everything is visible and editable.
|
||||||
- Fast Images Builds.
|
- Fast Images Builds.
|
||||||
@ -181,7 +181,7 @@ That's it! enjoy :)
|
|||||||
- **PHP Compilers:**
|
- **PHP Compilers:**
|
||||||
- PHP-FPM
|
- PHP-FPM
|
||||||
- HHVM
|
- HHVM
|
||||||
- **Message Queueing Systems:**
|
- **Message Queuing Systems:**
|
||||||
- Beanstalkd
|
- Beanstalkd
|
||||||
- Beanstalkd Console
|
- Beanstalkd Console
|
||||||
- RabbitMQ
|
- RabbitMQ
|
||||||
@ -240,17 +240,17 @@ Most importantly Docker can run on Development and on Production (same environme
|
|||||||
|
|
||||||
|
|
||||||
<a name="laradock-vs-homestead"></a>
|
<a name="laradock-vs-homestead"></a>
|
||||||
### Laradock VS Homestead (For Laravel Developers)
|
### LaraDock VS Homestead (For Laravel Developers)
|
||||||
|
|
||||||
> Laradock It's like Laravel Homestead but for Docker instead of Vagrant.
|
> LaraDock It's like Laravel Homestead but for Docker instead of Vagrant.
|
||||||
|
|
||||||
Laradock and [Homestead](https://laravel.com/docs/master/homestead) both give you complete virtual development environments. (Without the need to install and configure every single software on your own Operating System).
|
LaraDock and [Homestead](https://laravel.com/docs/master/homestead) both give you complete virtual development environments. (Without the need to install and configure every single software on your own Operating System).
|
||||||
|
|
||||||
- Homestead is a tool that controls Vagrant for you (using Homestead special commands). And Vagrant manages your Virtual Machine.
|
- Homestead is a tool that controls Vagrant for you (using Homestead special commands). And Vagrant manages your Virtual Machine.
|
||||||
|
|
||||||
- LaraDock is a tool that controls Docker for you (using Docker & Docker Compose official commands). And Docker manages your Virtual Containers.
|
- LaraDock is a tool that controls Docker for you (using Docker & Docker Compose official commands). And Docker manages your Virtual Containers.
|
||||||
|
|
||||||
Running a virtual Container is much faster than running a full virtual Machine. Thus **LaraDock is much faster than Homestead**.
|
Running a virtual container is much faster than running a full virtual Machine. Thus **LaraDock is much faster than Homestead**.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -301,7 +301,7 @@ git submodule add https://github.com/Laradock/laradock.git
|
|||||||
|
|
||||||
*Note 1: If you are not yet using Git for your PHP project, you can use `git clone https://github.com/Laradock/laradock.git` instead.*
|
*Note 1: If you are not yet using Git for your PHP project, you can use `git clone https://github.com/Laradock/laradock.git` instead.*
|
||||||
|
|
||||||
*Note 2: To keep track of your Laradock changes, between your projects and also keep Laradock updated. [Check this](#keep-tracking-Laradock)*
|
*Note 2: To keep track of your LaraDock changes, between your projects and also keep LaraDock updated. [Check this](#keep-tracking-LaraDock)*
|
||||||
|
|
||||||
*Note 3: In this case the folder structure will be like this:*
|
*Note 3: In this case the folder structure will be like this:*
|
||||||
|
|
||||||
@ -318,7 +318,7 @@ git submodule add https://github.com/Laradock/laradock.git
|
|||||||
1 - Clone this repository anywhere on your machine:
|
1 - Clone this repository anywhere on your machine:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git clone https://github.com/LaraDock/laradock.git
|
git clone https://github.com/laradock/laradock.git
|
||||||
```
|
```
|
||||||
Note: In this case the folder structure will be like this:
|
Note: In this case the folder structure will be like this:
|
||||||
|
|
||||||
@ -342,7 +342,7 @@ docker-compose stop && docker-compose up -d XXXX YYYY ZZZZ ....
|
|||||||
1 - Clone this repository anywhere on your machine:
|
1 - Clone this repository anywhere on your machine:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git clone https://github.com/LaraDock/laradock.git
|
git clone https://github.com/laradock/laradock.git
|
||||||
```
|
```
|
||||||
|
|
||||||
2 - Edit the `docker-compose.yml` file to map to your projects directories:
|
2 - Edit the `docker-compose.yml` file to map to your projects directories:
|
||||||
@ -355,7 +355,7 @@ git clone https://github.com/LaraDock/laradock.git
|
|||||||
- ../project2/:/var/www/project2
|
- ../project2/:/var/www/project2
|
||||||
```
|
```
|
||||||
|
|
||||||
3 - You can access all sites by visiting `http://localhost/project1/public` and `http://localhost/project2/public` but of course that's not very useful so let's setup nginx quickly.
|
3 - You can access all sites by visiting `http://localhost/project1/public` and `http://localhost/project2/public` but of course that's not very useful so let's setup NGINX quickly.
|
||||||
|
|
||||||
|
|
||||||
4 - Go to `nginx/sites` and copy `sample.conf.example` to `project1.conf` then to `project2.conf`
|
4 - Go to `nginx/sites` and copy `sample.conf.example` to `project1.conf` then to `project2.conf`
|
||||||
@ -388,8 +388,8 @@ Do the same for each project `project2.conf`, `project3.conf`,...
|
|||||||
|
|
||||||
If you are using **Docker Toolbox** (VM), do one of the following:
|
If you are using **Docker Toolbox** (VM), do one of the following:
|
||||||
|
|
||||||
- Upgrade to Docker [Native](https://www.docker.com/products/docker) for Mac/Windows (Recommended). Check out [Upgrading Laradock](#upgrading-laradock)
|
- Upgrade to Docker [Native](https://www.docker.com/products/docker) for Mac/Windows (Recommended). Check out [Upgrading LaraDock](#upgrading-laradock)
|
||||||
- Use LaraDock v3.* (Visit the `LaraDock-ToolBox` [Branch](https://github.com/LaraDock/laradock/tree/LaraDock-ToolBox)).
|
- Use LaraDock v3.* (Visit the `LaraDock-ToolBox` [Branch](https://github.com/laradock/laradock/tree/LaraDock-ToolBox)).
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
@ -422,7 +422,7 @@ You can select your own combination of Containers form the list below:
|
|||||||
docker-compose exec workspace bash
|
docker-compose exec workspace bash
|
||||||
```
|
```
|
||||||
|
|
||||||
Alternativey, for Windows Powershell users: execute the following command to enter any running container:
|
Alternatively, for Windows PowerShell users: execute the following command to enter any running container:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker exec -it {workspace-container-id} bash
|
docker exec -it {workspace-container-id} bash
|
||||||
@ -534,7 +534,7 @@ docker-compose exec {container-name} bash
|
|||||||
docker-compose exec mysql bash
|
docker-compose exec mysql bash
|
||||||
```
|
```
|
||||||
|
|
||||||
*Example: enter to mysql prompt within MySQL container*
|
*Example: enter to MySQL prompt within MySQL container*
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker-compose exec mysql mysql -u homestead -psecret
|
docker-compose exec mysql mysql -u homestead -psecret
|
||||||
@ -562,7 +562,7 @@ Change MySQL Database Name:
|
|||||||
...
|
...
|
||||||
```
|
```
|
||||||
|
|
||||||
Change Redis defaut port to 1111:
|
Change Redis default port to 1111:
|
||||||
|
|
||||||
```yml
|
```yml
|
||||||
ports:
|
ports:
|
||||||
@ -579,7 +579,7 @@ Change Redis defaut port to 1111:
|
|||||||
<a name="Edit-a-Docker-Image"></a>
|
<a name="Edit-a-Docker-Image"></a>
|
||||||
### Edit a Docker Image
|
### Edit a Docker Image
|
||||||
|
|
||||||
1 - Find the `dockerfile` of the image you want to edit,
|
1 - Find the `Dockerfile` of the image you want to edit,
|
||||||
<br>
|
<br>
|
||||||
example for `mysql` it will be `mysql/Dockerfile`.
|
example for `mysql` it will be `mysql/Dockerfile`.
|
||||||
|
|
||||||
@ -601,7 +601,7 @@ More info on Containers rebuilding [here](#Build-Re-build-Containers).
|
|||||||
<a name="Build-Re-build-Containers"></a>
|
<a name="Build-Re-build-Containers"></a>
|
||||||
### Build/Re-build Containers
|
### Build/Re-build Containers
|
||||||
|
|
||||||
If you do any change to any `dockerfile` make sure you run this command, for the changes to take effect:
|
If you do any change to any `Dockerfile` make sure you run this command, for the changes to take effect:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker-compose build
|
docker-compose build
|
||||||
@ -633,7 +633,7 @@ To add an image (software), just edit the `docker-compose.yml` and add your cont
|
|||||||
<br>
|
<br>
|
||||||
<a name="View-the-Log-files"></a>
|
<a name="View-the-Log-files"></a>
|
||||||
### View the Log files
|
### View the Log files
|
||||||
The Nginx Log file is stored in the `logs/nginx` directory.
|
The NGINX Log file is stored in the `logs/nginx` directory.
|
||||||
|
|
||||||
However to view the logs of all the other containers (MySQL, PHP-FPM,...) you can run this:
|
However to view the logs of all the other containers (MySQL, PHP-FPM,...) you can run this:
|
||||||
|
|
||||||
@ -705,7 +705,7 @@ docker-compose build php-fpm
|
|||||||
|
|
||||||
We do not natively support PHP 5.5 anymore, but you can get it in few steps:
|
We do not natively support PHP 5.5 anymore, but you can get it in few steps:
|
||||||
|
|
||||||
1 - Clone `https://github.com/LaraDock/php-fpm`.
|
1 - Clone `https://github.com/laradock/php-fpm`.
|
||||||
|
|
||||||
3 - Rename `Dockerfile-56` to `Dockerfile-55`.
|
3 - Rename `Dockerfile-56` to `Dockerfile-55`.
|
||||||
|
|
||||||
@ -773,7 +773,7 @@ It should be like this:
|
|||||||
|
|
||||||
2 - Re-build the containers `docker-compose build workspace php-fpm`
|
2 - Re-build the containers `docker-compose build workspace php-fpm`
|
||||||
|
|
||||||
3 - Open `laradock/workspace/xdebug.ini` and/or `laradock/php-fpm/xdebug.ini` and enable at least the following configs:
|
3 - Open `laradock/workspace/xdebug.ini` and/or `laradock/php-fpm/xdebug.ini` and enable at least the following configurations:
|
||||||
|
|
||||||
```
|
```
|
||||||
xdebug.remote_autostart=1
|
xdebug.remote_autostart=1
|
||||||
@ -848,7 +848,7 @@ It should be like this:
|
|||||||
<a name="LaraDock-for-Production"></a>
|
<a name="LaraDock-for-Production"></a>
|
||||||
### Prepare LaraDock for Production
|
### Prepare LaraDock for Production
|
||||||
|
|
||||||
It's recommended for production to create a custom `docker-compose.yml` file. For that reason, LaraDock is shipped with `production-docker-compose.yml` which should contain only the containers you are planning to run on production (usage exampe: `docker-compose -f production-docker-compose.yml up -d nginx mysql redis ...`).
|
It's recommended for production to create a custom `docker-compose.yml` file. For that reason, LaraDock is shipped with `production-docker-compose.yml` which should contain only the containers you are planning to run on production (usage example: `docker-compose -f production-docker-compose.yml up -d nginx mysql redis ...`).
|
||||||
|
|
||||||
Note: The Database (MySQL/MariaDB/...) ports should not be forwarded on production, because Docker will automatically publish the port on the host, which is quite insecure, unless specifically told not to. So make sure to remove these lines:
|
Note: The Database (MySQL/MariaDB/...) ports should not be forwarded on production, because Docker will automatically publish the port on the host, which is quite insecure, unless specifically told not to. So make sure to remove these lines:
|
||||||
|
|
||||||
@ -868,7 +868,7 @@ To learn more about how Docker publishes ports, please read [this excellent post
|
|||||||
<a name="Digital-Ocean"></a>
|
<a name="Digital-Ocean"></a>
|
||||||
### Setup Laravel and Docker on Digital Ocean
|
### Setup Laravel and Docker on Digital Ocean
|
||||||
|
|
||||||
####[Full Guide Here](https://github.com/LaraDock/laradock/blob/master/_guides/digital_ocean.md)
|
####[Full Guide Here](https://github.com/laradock/laradock/blob/master/_guides/digital_ocean.md)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -975,7 +975,7 @@ phpunit
|
|||||||
<a name="Run-Laravel-Queue-Worker"></a>
|
<a name="Run-Laravel-Queue-Worker"></a>
|
||||||
### Run Laravel Queue Worker
|
### Run Laravel Queue Worker
|
||||||
|
|
||||||
1 - First add `php-worker` container. It will be similar as like PHP-FPM Containter.
|
1 - First add `php-worker` container. It will be similar as like PHP-FPM Container.
|
||||||
<br>
|
<br>
|
||||||
a) open the `docker-compose.yml` file
|
a) open the `docker-compose.yml` file
|
||||||
<br>
|
<br>
|
||||||
@ -1195,7 +1195,7 @@ b. set the queue host to beanstalkd : `QUEUE_HOST=beanstalkd`
|
|||||||
|
|
||||||
*beanstalkd is now available on default port `11300`.*
|
*beanstalkd is now available on default port `11300`.*
|
||||||
|
|
||||||
3 - Require the dependecy package [pda/pheanstalk](https://github.com/pda/pheanstalk) using composer.
|
3 - Require the dependency package [pda/pheanstalk](https://github.com/pda/pheanstalk) using composer.
|
||||||
|
|
||||||
|
|
||||||
Optionally you can use the Beanstalkd Console Container to manage your Queues from a web interface.
|
Optionally you can use the Beanstalkd Console Container to manage your Queues from a web interface.
|
||||||
@ -1326,7 +1326,7 @@ docker-compose up -d rethinkdb
|
|||||||
<a name="Install-CodeIgniter"></a>
|
<a name="Install-CodeIgniter"></a>
|
||||||
### Install CodeIgniter
|
### Install CodeIgniter
|
||||||
|
|
||||||
To install CodeIgniter 3 on Laradock all you have to do is the following simple steps:
|
To install CodeIgniter 3 on LaraDock all you have to do is the following simple steps:
|
||||||
|
|
||||||
1 - Open the `docker-compose.yml` file.
|
1 - Open the `docker-compose.yml` file.
|
||||||
|
|
||||||
@ -1432,9 +1432,9 @@ ports:
|
|||||||
<a name="MySQL-root-access"></a>
|
<a name="MySQL-root-access"></a>
|
||||||
### MySQL root access
|
### MySQL root access
|
||||||
|
|
||||||
The default username and password for the root mysql user are `root` and `root `.
|
The default username and password for the root MySQL user are `root` and `root `.
|
||||||
|
|
||||||
1 - Enter the mysql contaier: `docker-compose exec mysql bash`.
|
1 - Enter the MySQL container: `docker-compose exec mysql bash`.
|
||||||
|
|
||||||
2 - Enter mysql: `mysql -uroot -proot` for non root access use `mysql -uhomestead -psecret`.
|
2 - Enter mysql: `mysql -uroot -proot` for non root access use `mysql -uhomestead -psecret`.
|
||||||
|
|
||||||
@ -1480,7 +1480,7 @@ Assuming your custom domain is `laravel.dev`
|
|||||||
2 - Open your browser and visit `{http://laravel.dev}`
|
2 - Open your browser and visit `{http://laravel.dev}`
|
||||||
|
|
||||||
|
|
||||||
Optionally you can define the server name in the nginx configuration file, like this:
|
Optionally you can define the server name in the NGINX configuration file, like this:
|
||||||
|
|
||||||
```conf
|
```conf
|
||||||
server_name laravel.dev;
|
server_name laravel.dev;
|
||||||
@ -1631,7 +1631,7 @@ It should be like this:
|
|||||||
<a name="Common-Aliases"></a>
|
<a name="Common-Aliases"></a>
|
||||||
<br>
|
<br>
|
||||||
### Common Terminal Aliases
|
### Common Terminal Aliases
|
||||||
When you start your docker container, Laradock will copy the `aliases.sh` file located in the `laradock/workspace` directory and add sourcing to the container `~/.bashrc` file.
|
When you start your docker container, LaraDock will copy the `aliases.sh` file located in the `laradock/workspace` directory and add sourcing to the container `~/.bashrc` file.
|
||||||
|
|
||||||
You are free to modify the `aliases.sh` as you see fit, adding your own aliases (or function macros) to suit your requirements.
|
You are free to modify the `aliases.sh` as you see fit, adding your own aliases (or function macros) to suit your requirements.
|
||||||
|
|
||||||
@ -1716,7 +1716,7 @@ It should be like this:
|
|||||||
### PHPStorm Debugging Guide
|
### PHPStorm Debugging Guide
|
||||||
Remote debug Laravel web and phpunit tests.
|
Remote debug Laravel web and phpunit tests.
|
||||||
|
|
||||||
######[Debugging Guide Here](https://github.com/LaraDock/laradock/blob/master/_guides/phpstorm.md)
|
######[Debugging Guide Here](https://github.com/laradock/laradock/blob/master/_guides/phpstorm.md)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -1726,13 +1726,13 @@ Remote debug Laravel web and phpunit tests.
|
|||||||
|
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
<a name="keep-tracking-Laradock"></a>
|
<a name="keep-tracking-LaraDock"></a>
|
||||||
### Keep track of your Laradock changes
|
### Keep track of your LaraDock changes
|
||||||
|
|
||||||
1. Fork the Lardock repository.
|
1. Fork the LaraDock repository.
|
||||||
2. Use that fork as a submodule.
|
2. Use that fork as a submodule.
|
||||||
3. Commit all your changes to your fork.
|
3. Commit all your changes to your fork.
|
||||||
4. Pull new stuff from the main repo from time to time.
|
4. Pull new stuff from the main repository from time to time.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -1745,14 +1745,14 @@ Remote debug Laravel web and phpunit tests.
|
|||||||
|
|
||||||
Moving from Docker Toolbox (VirtualBox) to Docker Native (for Mac/Windows). Requires upgrading LaraDock from v3.* to v4.*:
|
Moving from Docker Toolbox (VirtualBox) to Docker Native (for Mac/Windows). Requires upgrading LaraDock from v3.* to v4.*:
|
||||||
|
|
||||||
1. Stop the docker vm `docker-machine stop {default}`
|
1. Stop the docker VM `docker-machine stop {default}`
|
||||||
2. Install Docker for [Mac](https://docs.docker.com/docker-for-mac/) or [Windows](https://docs.docker.com/docker-for-windows/).
|
2. Install Docker for [Mac](https://docs.docker.com/docker-for-mac/) or [Windows](https://docs.docker.com/docker-for-windows/).
|
||||||
3. Upgrade LaraDock to `v4.*.*` (`git pull origin master`)
|
3. Upgrade LaraDock to `v4.*.*` (`git pull origin master`)
|
||||||
4. Use LaraDock as you used to do: `docker-compose up -d nginx mysql`.
|
4. Use LaraDock as you used to do: `docker-compose up -d nginx mysql`.
|
||||||
|
|
||||||
**Note:** If you face any problem with the last step above: rebuild all your containers
|
**Note:** If you face any problem with the last step above: rebuild all your containers
|
||||||
`docker-compose build --no-cache`
|
`docker-compose build --no-cache`
|
||||||
"Warnning Containers Data might be lost!"
|
"Warning Containers Data might be lost!"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -1802,7 +1802,7 @@ Make sure the ports for the services that you are trying to run (22, 80, 443, 33
|
|||||||
|
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
#### I get Nginx error 404 Not Found on Windows.
|
#### I get NGINX error 404 Not Found on Windows.
|
||||||
|
|
||||||
1. Go to docker Settings on your Windows machine.
|
1. Go to docker Settings on your Windows machine.
|
||||||
2. Click on the `Shared Drives` tab and check the drive that contains your project files.
|
2. Click on the `Shared Drives` tab and check the drive that contains your project files.
|
||||||
@ -1821,7 +1821,7 @@ Make sure the ports for the services that you are trying to run (22, 80, 443, 33
|
|||||||
|
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
#### I get Mysql connection refused
|
#### I get MySQL connection refused
|
||||||
|
|
||||||
This error sometimes happens because your Laravel application isn't running on the container localhost IP (Which is 127.0.0.1). Steps to fix it:
|
This error sometimes happens because your Laravel application isn't running on the container localhost IP (Which is 127.0.0.1). Steps to fix it:
|
||||||
|
|
||||||
@ -1829,7 +1829,7 @@ This error sometimes happens because your Laravel application isn't running on t
|
|||||||
1. Check your running Laravel application IP by dumping `Request::ip()` variable using `dd(Request::ip())` anywhere on your application. The result is the IP of your Laravel container.
|
1. Check your running Laravel application IP by dumping `Request::ip()` variable using `dd(Request::ip())` anywhere on your application. The result is the IP of your Laravel container.
|
||||||
2. Change the `DB_HOST` variable on env with the IP that you received from previous step.
|
2. Change the `DB_HOST` variable on env with the IP that you received from previous step.
|
||||||
* Option B
|
* Option B
|
||||||
1. Change the `DB_HOST` value to the same name as the mysql docker container. The Laradock docker-compose file currently has this as `mysql`
|
1. Change the `DB_HOST` value to the same name as the MySQL docker container. The LaraDock docker-compose file currently has this as `mysql`
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -1842,7 +1842,7 @@ This error sometimes happens because your Laravel application isn't running on t
|
|||||||
|
|
||||||
This little project was built by one man who has a full time job and many responsibilities, so if you like this project and you find that it needs a bug fix or support for new software or upgrade any container, or anything else, do not hesitate to contribute, you are more than welcome :)
|
This little project was built by one man who has a full time job and many responsibilities, so if you like this project and you find that it needs a bug fix or support for new software or upgrade any container, or anything else, do not hesitate to contribute, you are more than welcome :)
|
||||||
|
|
||||||
#### Read the [Contribution Guidelines](https://github.com/LaraDock/laradock/blob/master/CONTRIBUTING.md).
|
#### Read the [Contribution Guidelines](https://github.com/laradock/laradock/blob/master/CONTRIBUTING.md).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -1857,7 +1857,7 @@ LaraDock related projects:
|
|||||||
* [LaraDock CLI](https://github.com/lorinlee/laradock-cli) by [LorinLee](https://github.com/lorinlee)
|
* [LaraDock CLI](https://github.com/lorinlee/laradock-cli) by [LorinLee](https://github.com/lorinlee)
|
||||||
* [LaraDock Env](https://github.com/bagart/laradock_env) by [BAGArt](https://github.com/bagart)
|
* [LaraDock Env](https://github.com/bagart/laradock_env) by [BAGArt](https://github.com/bagart)
|
||||||
* [Klaradock](https://github.com/poyhsiao/Klaradock) by [Kim Hsiao](https://github.com/poyhsiao)
|
* [Klaradock](https://github.com/poyhsiao/Klaradock) by [Kim Hsiao](https://github.com/poyhsiao)
|
||||||
* [Ansible Laradock Kubernetes](https://github.com/sifat-rahim/ansible-laradock-kubernetes) by [Sifat Rahim](https://github.com/sifat-rahim)
|
* [Ansible LaraDock Kubernetes](https://github.com/sifat-rahim/ansible-laradock-kubernetes) by [Sifat Rahim](https://github.com/sifat-rahim)
|
||||||
|
|
||||||
These Docker Compose projects have piqued our interest:
|
These Docker Compose projects have piqued our interest:
|
||||||
* [MageDock](https://github.com/ojhaujjwal/magedock) by [Ujjwal Ojha](https://github.com/ojhaujjwal)
|
* [MageDock](https://github.com/ojhaujjwal/magedock) by [Ujjwal Ojha](https://github.com/ojhaujjwal)
|
||||||
@ -1877,7 +1877,7 @@ If you want your project listed here, please open an issue.
|
|||||||
|
|
||||||
Join the chat room on [Gitter](https://gitter.im/LaraDock/laradock) and get help and support from the community.
|
Join the chat room on [Gitter](https://gitter.im/LaraDock/laradock) and get help and support from the community.
|
||||||
|
|
||||||
You can as well can open an [issue](https://github.com/laradock/laradock/issues) on Github (will be labeled as Question) and discuss it with people on [Gitter](https://gitter.im/LaraDock/laradock).
|
You can as well can open an [issue](https://github.com/laradock/laradock/issues) on GitHub (will be labeled as Question) and discuss it with people on [Gitter](https://gitter.im/LaraDock/laradock).
|
||||||
|
|
||||||
For special help with Docker and/or Laravel, you can schedule a live call with the creator of this project at [Codementor.io](https://www.codementor.io/mahmoudz).
|
For special help with Docker and/or Laravel, you can schedule a live call with the creator of this project at [Codementor.io](https://www.codementor.io/mahmoudz).
|
||||||
|
|
||||||
@ -1890,7 +1890,7 @@ For special help with Docker and/or Laravel, you can schedule a live call with t
|
|||||||
|
|
||||||
**Super Admins:**
|
**Super Admins:**
|
||||||
|
|
||||||
- [Mahmoud Zalt](https://github.com/Mahmoudz) (mahmoudz) [ [Twitter](https://twitter.com/Mahmoud_Zalt) | [Personal Site](http://zalt.me) | [Linkedin](https://www.linkedin.com/in/mahmoudzalt) ]
|
- [Mahmoud Zalt](https://github.com/Mahmoudz) (mahmoudz) [ [Twitter](https://twitter.com/Mahmoud_Zalt) | [Personal Site](http://zalt.me) | [LinkedIn](https://www.linkedin.com/in/mahmoudzalt) ]
|
||||||
- [Bo-Yi Wu](https://github.com/appleboy) (appleboy)
|
- [Bo-Yi Wu](https://github.com/appleboy) (appleboy)
|
||||||
- [Philippe Trépanier](https://github.com/philtrep) (philtrep)
|
- [Philippe Trépanier](https://github.com/philtrep) (philtrep)
|
||||||
- [Mike Erickson](https://github.com/mikeerickson) (mikeerickson)
|
- [Mike Erickson](https://github.com/mikeerickson) (mikeerickson)
|
||||||
@ -1898,7 +1898,7 @@ For special help with Docker and/or Laravel, you can schedule a live call with t
|
|||||||
|
|
||||||
**Amazing Contributors:**
|
**Amazing Contributors:**
|
||||||
|
|
||||||
- [Contributors](https://github.com/LaraDock/laradock/graphs/contributors)
|
- [Contributors](https://github.com/laradock/laradock/graphs/contributors)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user