From fef6ec86b361b5d039da21b9d1b60c6deff80d25 Mon Sep 17 00:00:00 2001 From: Mahmoud Zalt Date: Thu, 20 Apr 2017 13:55:09 -0400 Subject: [PATCH] little cleanup --- .travis.yml | 2 +- DOCUMENTATION/content/documentation/index.md | 8 +-- .../content/getting-started/index.md | 2 +- DOCUMENTATION/content/guides/index.md | 26 ++++----- README-zh.md | 58 +++++++++---------- docs/documentation/index.html | 8 +-- docs/documentation/index.xml | 10 ++-- docs/getting-started/index.html | 2 +- docs/getting-started/index.xml | 4 +- docs/index.html | 36 ++++++------ docs/index.xml | 38 ++++++------ php-fpm/Dockerfile-56 | 4 +- php-fpm/Dockerfile-70 | 4 +- php-fpm/Dockerfile-71 | 4 +- xdebugPhpFpm => php-fpm/xdebug | 2 +- _scripts/travis-build.sh => travis-build.sh | 0 workspace/Dockerfile-56 | 4 +- workspace/Dockerfile-70 | 4 +- workspace/Dockerfile-71 | 4 +- 19 files changed, 110 insertions(+), 110 deletions(-) rename xdebugPhpFpm => php-fpm/xdebug (98%) rename _scripts/travis-build.sh => travis-build.sh (100%) diff --git a/.travis.yml b/.travis.yml index a4b38373..00dc2c9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ env: - PHP_VERSION=71 - HUGO_VERSION=0.19 -script: ./_scripts/travis-build.sh +script: ./travis-build.sh deploy: provider: pages diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index a938384b..48df261f 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -336,11 +336,11 @@ By installing xDebug, you are enabling it to run on startup by default. To control the behavior of xDebug (in the `php-fpm` Container), you can run the following commands from the Laradock root folder, (at the same prompt where you run docker-compose): -- Stop xDebug from running by default: `./xdebugPhpFpm stop`. -- Start xDebug by default: `./xdebugPhpFpm start`. -- See the status: `./xdebugPhpFpm status`. +- Stop xDebug from running by default: `.php-fpm/xdebug stop`. +- Start xDebug by default: `.php-fpm/xdebug start`. +- See the status: `.php-fpm/xdebug status`. -Note: If `./xdebugPhpFpm` doesn't execute and gives `Permission Denied` error the problem can be that file `xdebugPhpFpm` doesn't have execution access. This can be fixed by running `chmod` command with desired access permissions. +Note: If `.php-fpm/xdebug` doesn't execute and gives `Permission Denied` error the problem can be that file `xdebug` doesn't have execution access. This can be fixed by running `chmod` command with desired access permissions. diff --git a/DOCUMENTATION/content/getting-started/index.md b/DOCUMENTATION/content/getting-started/index.md index b5564dde..9172688d 100644 --- a/DOCUMENTATION/content/getting-started/index.md +++ b/DOCUMENTATION/content/getting-started/index.md @@ -138,7 +138,7 @@ You can rename the config files, project folders and domains as you like, just m 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](/documentation/#upgrading-laradock) -- Use Laradock v3.\*. Visit the [LaraDock-ToolBox](https://github.com/laradock/laradock/tree/LaraDock-ToolBox) branch. *(outdated)* +- Use Laradock v3.\*. Visit the [Laradock-ToolBox](https://github.com/laradock/laradock/tree/Laradock-ToolBox) branch. *(outdated)*
diff --git a/DOCUMENTATION/content/guides/index.md b/DOCUMENTATION/content/guides/index.md index 6be3e330..8385d5b3 100644 --- a/DOCUMENTATION/content/guides/index.md +++ b/DOCUMENTATION/content/guides/index.md @@ -45,7 +45,7 @@ $root@server:~# docker $root@server:~# apt-get install git $root@server:~# git clone https://github.com/laravel/laravel $root@server:~# cd laravel -$root@server:~/laravel/ git submodule add https://github.com/LaraDock/laradock.git +$root@server:~/laravel/ git submodule add https://github.com/Laradock/laradock.git $root@server:~/laravel/ cd laradock ``` @@ -56,7 +56,7 @@ $root@server:~/laravel/laradock# curl -L https://github.com/docker/compose/relea $root@server:~/chmod +x /usr/local/bin/docker-compose ``` -## Create Your LaraDock Containers +## Create Your Laradock Containers ``` $root@server:~/laravel/laradock# docker-compose up -d nginx mysql @@ -248,7 +248,7 @@ View your Site in the Browser Securely Using HTTPS (https://yourdomain.com) - [Installation](#Installation) - [Customize laradock/docker-compose.yml](#CustomizeDockerCompose) - [Clean House](#InstallCleanHouse) - - [LaraDock Dial Tone](#InstallLaraDockDialTone) + - [Laradock Dial Tone](#InstallLaradockDialTone) - [hosts](#AddToHosts) - [Firewall](#FireWall) - [Enable xDebug on php-fpm](#enablePhpXdebug) @@ -265,14 +265,14 @@ View your Site in the Browser Securely Using HTTPS (https://yourdomain.com) ## Intro -Wiring up [Laravel](https://laravel.com/), [LaraDock](https://github.com/LaraDock/laradock) [Laravel+Docker] and [PHPStorm](https://www.jetbrains.com/phpstorm/) to play nice together complete with remote xdebug'ing as icing on top! Although this guide is based on `PHPStorm Windows`, +Wiring up [Laravel](https://laravel.com/), [Laradock](https://github.com/Laradock/laradock) [Laravel+Docker] and [PHPStorm](https://www.jetbrains.com/phpstorm/) to play nice together complete with remote xdebug'ing as icing on top! Although this guide is based on `PHPStorm Windows`, you should be able to adjust accordingly. This guide was written based on Docker for Windows Native. ## Installation - This guide assumes the following: - - you have already installed and are familiar with Laravel, LaraDock and PHPStorm. + - you have already installed and are familiar with Laravel, Laradock and PHPStorm. - you have installed Laravel as a parent of `laradock`. This guide assumes `/c/_dk/laravel`. @@ -332,7 +332,7 @@ xdebug.cli_color=1 ### Need to clean house first? -Make sure you are starting with a clean state. For example, do you have other LaraDock containers and images? +Make sure you are starting with a clean state. For example, do you have other Laradock containers and images? Here are a few things I use to clean things up. - Delete all containers using `grep laradock_` on the names, see: [Remove all containers based on docker image name](https://linuxconfig.org/remove-all-containners-based-on-docker-image-name). @@ -340,7 +340,7 @@ Here are a few things I use to clean things up. - Delete all images containing `laradock`. `docker images | awk '{print $1,$2,$3}' | grep laradock_ | awk '{print $3}' | xargs -I {} docker rmi {}` -**Note:** This will only delete images that were built with `LaraDock`, **NOT** `laradock/*` which are pulled down by `LaraDock` such as `laradock/workspace`, etc. +**Note:** This will only delete images that were built with `Laradock`, **NOT** `laradock/*` which are pulled down by `Laradock` such as `laradock/workspace`, etc. **Note:** Some may fail with: `Error response from daemon: conflict: unable to delete 3f38eaed93df (cannot be forced) - image has dependent child images` @@ -359,7 +359,7 @@ Here are a few things I use to clean things up. } ``` -- If you frequently switch configurations for LaraDock, you may find that adding the following and added to your `.bashrc` or equivalent useful: +- If you frequently switch configurations for Laradock, you may find that adding the following and added to your `.bashrc` or equivalent useful: ``` # remove laravel* containers # remove laravel_* images @@ -383,7 +383,7 @@ dcleanlaradockfunction() alias dcleanlaradock=dcleanlaradockfunction ``` - + ## Let's get a dial-tone with Laravel ``` @@ -408,7 +408,7 @@ laradock_workspace_1 /sbin/my_init Up 0.0.0.0:2222- ## Enable xDebug on php-fpm -In a host terminal sitting in the laradock folder, run: `./xdebugPhpFpm status` +In a host terminal sitting in the laradock folder, run: `.php-fpm/xdebug status` You should see something like the following: ``` xDebug status @@ -418,7 +418,7 @@ Copyright (c) 1997-2016 The PHP Group Zend Engine v3.0.0, Copyright (c) 1998-2016 Zend Technologies with Xdebug v2.4.1, Copyright (c) 2002-2016, by Derick Rethans ``` -Other commands include `./xdebugPhpFpm start | stop`. +Other commands include `.php-fpm/xdebug start | stop`. If you have enabled `xdebug=true` in `docker-compose.yml/php-fpm`, `xdebug` will already be running when `php-fpm` is started and listening for debug info on port 9000. @@ -503,9 +503,9 @@ If you have enabled `xdebug=true` in `docker-compose.yml/php-fpm`, `xdebug` will ### Debug WebSite - In case xDebug is disabled, from the `laradock` folder run: -`./xdebugPhpFpm start`. +`.php-fpm/xdebug start`. - To switch xdebug off, run: -`./xdebugPhpFpm stop` +`.php-fpm/xdebug stop` - Start Remote Debugging - ![DebugRemoteOn](photos/PHPStorm/DebugRemoteOn.png) diff --git a/README-zh.md b/README-zh.md index 2e7e91b0..9614e2e9 100644 --- a/README-zh.md +++ b/README-zh.md @@ -1,14 +1,14 @@ -# LaraDock +# Laradock [![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 能够帮你在 **Docker** 上快速搭建 **Laravel** 应用。 +Laradock 能够帮你在 **Docker** 上快速搭建 **Laravel** 应用。 就像 Laravel Homestead 一样，但是 Docker 替换了 Vagrant。 -> 先在使用 LaraDock，然后再学习它们。 +> 先在使用 Laradock，然后再学习它们。 ## 目录 - [Intro](#Intro) @@ -17,7 +17,7 @@ LaraDock 能够帮你在 **Docker** 上快速搭建 **Laravel** 应用。 - [What is Docker](#what-is-docker) - [What is Laravel](#what-is-laravel) - [Why Docker not Vagrant](#why-docker-not-vagrant) - - [LaraDock VS Homestead](#laradock-vs-homestead) + - [Laradock VS Homestead](#laradock-vs-homestead) - [Demo Video](#Demo) - [Requirements](#Requirements) - [Installation](#Installation) @@ -49,27 +49,27 @@ LaraDock 能够帮你在 **Docker** 上快速搭建 **Laravel** 应用。 - [Install Prestissimo](#Install-Prestissimo) - [Install Node + NVM](#Install-Node) - [Debugging](#debugging) - - [Upgrading LaraDock](#upgrading-laradock) + - [Upgrading Laradock](#upgrading-laradock) - [Help & Questions](#Help) ## 介绍 -LaraDock 努力简化创建开发环境过程。 +Laradock 努力简化创建开发环境过程。 它包含预包装 Docker 镜像，提供你一个美妙的开发环境而不需要安装 PHP, NGINX, MySQL 和其他任何软件在你本地机器上。 **使用概览：** 让我们了解使用它安装 `NGINX`, `PHP`, `Composer`, `MySQL` 和 `Redis`，然后运行 `Laravel` -1. 将 LaraDock 放到你的 Laravel 项目中： +1. 将 Laradock 放到你的 Laravel 项目中： ```bash git clone https://github.com/laradock/laradock.git ``` -2. 进入 LaraDock 目录，然后运行这些容器。 +2. 进入 Laradock 目录，然后运行这些容器。 ```bash docker-compose up -d nginx mysql redis @@ -142,22 +142,22 @@ docker-compose up -d nginx mysql redis 最重要的是 Docker 可以运行在开发和生产(相同环境无处不在)。Vagrant 是专为开发,(所以在生产环境你必须每一次重建您的服务器)。 -### LaraDock Homestead 对比 +### Laradock Homestead 对比 -LaraDock and [Homestead](https://laravel.com/docs/master/homestead) 给你一个完整的虚拟开发环境。(不需要安装和配置软件在你自己的每一个操作系统)。 +Laradock and [Homestead](https://laravel.com/docs/master/homestead) 给你一个完整的虚拟开发环境。(不需要安装和配置软件在你自己的每一个操作系统)。 Homestead 是一个工具,为你控制虚拟机(使用 Homestead 特殊命令)。Vagrant 可以管理你的管理虚容器。 -运行一个虚拟容器比运行一整个虚拟机快多了 **LaraDock 比 Homestead 快多了** +运行一个虚拟容器比运行一整个虚拟机快多了 **Laradock 比 Homestead 快多了** ## 演示视频 还有什么比**演示视频**好： -- LaraDock [v4.0](https://www.youtube.com/watch?v=TQii1jDa96Y) -- LaraDock [v2.2](https://www.youtube.com/watch?v=-DamFMczwDA) -- LaraDock [v0.3](https://www.youtube.com/watch?v=jGkyO6Is_aI) -- LaraDock [v0.1](https://www.youtube.com/watch?v=3YQsHe6oF80) +- Laradock [v4.0](https://www.youtube.com/watch?v=TQii1jDa96Y) +- Laradock [v2.2](https://www.youtube.com/watch?v=-DamFMczwDA) +- Laradock [v0.3](https://www.youtube.com/watch?v=jGkyO6Is_aI) +- Laradock [v0.1](https://www.youtube.com/watch?v=3YQsHe6oF80) ## 依赖 @@ -168,7 +168,7 @@ Homestead 是一个工具,为你控制虚拟机(使用 Homestead 特殊命令) ## 安装 -1 - 克隆 `LaraDock` 仓库: +1 - 克隆 `Laradock` 仓库: **A)** 如果你已经有一个 Laravel 项目,克隆这个仓库在到 `Laravel` 根目录 @@ -189,9 +189,9 @@ git clone https://github.com/laradock/laradock.git **请在开始之前阅读:** 如果你正在使用 **Docker Toolbox** (VM)，选择以下任何一个方法： -- 更新到 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)). -如果您使用的是 **Docker Native**(Mac / Windows 版本)甚至是 Linux 版本,通常可以继续阅读这个文档，LaraDock v4 以上版本将仅支持 **Docker Native**。 +- 更新到 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)). +如果您使用的是 **Docker Native**(Mac / Windows 版本)甚至是 Linux 版本,通常可以继续阅读这个文档，Laradock v4 以上版本将仅支持 **Docker Native**。 1 - 运行容器: *(在运行 `docker-compose` 命令之前，确认你在 `laradock` 目录中* @@ -377,7 +377,7 @@ composer create-project laravel/laravel my-cool-app "5.2.*" 3 - 编辑 `docker-compose.yml` 映射新的应用目录: -系统默认 LaraDock 假定 Laravel 应用在 laradock 的父级目录中 +系统默认 Laradock 假定 Laravel 应用在 laradock 的父级目录中 更新 Laravel 应用在 `my-cool-app` 目录中, 我们需要用 `../my-cool-app/:/var/www`替换 `../:/var/www` , 如下: @@ -394,7 +394,7 @@ composer create-project laravel/laravel my-cool-app "5.2.*" cd my-cool-app ``` -5 - 回到 LaraDock 安装步骤,看看如何编辑 `.env` 的文件。 +5 - 回到 Laradock 安装步骤,看看如何编辑 `.env` 的文件。 ### 运行 Artisan 命令 @@ -477,7 +477,7 @@ composer require predis/predis:^1.0 5 - 你可以用以下代码在 Laravel 中手动测试： ```php -\Cache::store('redis')->put('LaraDock', 'Awesome', 10); +\Cache::store('redis')->put('Laradock', 'Awesome', 10); ``` @@ -766,15 +766,15 @@ sudo chmod -R 777 storage bootstrap/cache 确保你想运行的服务端口(80, 3306, etc.)不是已经被其他程序使用，例如 `apache`/`httpd` 服务或其他安装的开发工具 -### LaraDock 升级 +### Laradock 升级 -从 Docker Toolbox (VirtualBox) 移动到 Docker Native (for Mac/Windows)，需要从 LaraDock v3.* 升级到 v4.*: +从 Docker Toolbox (VirtualBox) 移动到 Docker Native (for Mac/Windows)，需要从 Laradock v3.* 升级到 v4.*: 1. 停止 Docker 虚拟机 `docker-machine stop {default}` 2. 安装 Docker [Mac](https://docs.docker.com/docker-for-mac/) 或 [Windows](https://docs.docker.com/docker-for-windows/). -3. 升级 LaraDock 到 `v4.*.*` (`git pull origin master`) -4. 像之前一样使用 LaraDock: `docker-compose up -d nginx mysql`. +3. 升级 Laradock 到 `v4.*.*` (`git pull origin master`) +4. 像之前一样使用 Laradock: `docker-compose up -d nginx mysql`. **说明:** 如果你面临任何上面的问题的最后一步:重建你所有的容器 ```bash @@ -791,9 +791,9 @@ docker-compose build --no-cache ## 帮助 & 问题 -从聊天室 [Gitter](https://gitter.im/LaraDock/laradock) 社区获取帮助和支持. +从聊天室 [Gitter](https://gitter.im/Laradock/laradock) 社区获取帮助和支持. -你也可以打开 Github 上的 [issue](https://github.com/laradock/laradock/issues) (将被贴上问题和答案) 或与大家讨论 [Gitter](https://gitter.im/LaraDock/laradock). +你也可以打开 Github 上的 [issue](https://github.com/laradock/laradock/issues) (将被贴上问题和答案) 或与大家讨论 [Gitter](https://gitter.im/Laradock/laradock). Docker 或 Laravel 的特别帮助，你可以在 [Codementor.io](https://www.codementor.io/mahmoudz) 上直接和项目创始人在线沟通 diff --git a/docs/documentation/index.html b/docs/documentation/index.html index 104a9f49..905dfa10 100644 --- a/docs/documentation/index.html +++ b/docs/documentation/index.html @@ -607,12 +607,12 @@ xdebug.remote_connect_back=1

To control the behavior of xDebug (in the php-fpm Container), you can run the following commands from the Laradock root folder, (at the same prompt where you run docker-compose):

-

Note: If ./xdebugPhpFpm doesn’t execute and gives Permission Denied error the problem can be that file xdebugPhpFpm doesn’t have execution access. This can be fixed by running chmod command with desired access permissions.

+

Note: If .php-fpm/xdebug doesn’t execute and gives Permission Denied error the problem can be that file xdebug doesn’t have execution access. This can be fixed by running chmod command with desired access permissions.


diff --git a/docs/documentation/index.xml b/docs/documentation/index.xml index 421db9e7..f1db1822 100644 --- a/docs/documentation/index.xml +++ b/docs/documentation/index.xml @@ -288,12 +288,12 @@ xdebug.remote_connect_back=1 <p>To control the behavior of xDebug (in the <code>php-fpm</code> Container), you can run the following commands from the Laradock root folder, (at the same prompt where you run docker-compose):</p> <ul> -<li>Stop xDebug from running by default: <code>./xdebugPhpFpm stop</code>.</li> -<li>Start xDebug by default: <code>./xdebugPhpFpm start</code>.</li> -<li>See the status: <code>./xdebugPhpFpm status</code>.</li> +<li>Stop xDebug from running by default: <code>.php-fpm/xdebug stop</code>.</li> +<li>Start xDebug by default: <code>.php-fpm/xdebug start</code>.</li> +<li>See the status: <code>.php-fpm/xdebug status</code>.</li> </ul> -<p>Note: If <code>./xdebugPhpFpm</code> doesn&rsquo;t execute and gives <code>Permission Denied</code> error the problem can be that file <code>xdebugPhpFpm</code> doesn&rsquo;t have execution access. This can be fixed by running <code>chmod</code> command with desired access permissions.</p> +<p>Note: If <code>.php-fpm/xdebug</code> doesn&rsquo;t execute and gives <code>Permission Denied</code> error the problem can be that file <code>xdebug</code> doesn&rsquo;t have execution access. This can be fixed by running <code>chmod</code> command with desired access permissions.</p> <p><br> <a name="Install-Deployer"></a></p> @@ -1248,4 +1248,4 @@ e) set it to <code>true</code></p> - \ No newline at end of file + diff --git a/docs/getting-started/index.html b/docs/getting-started/index.html index 0ec90ee0..51c198c4 100644 --- a/docs/getting-started/index.html +++ b/docs/getting-started/index.html @@ -472,7 +472,7 @@


diff --git a/docs/getting-started/index.xml b/docs/getting-started/index.xml index d7bebb40..ade36fd4 100644 --- a/docs/getting-started/index.xml +++ b/docs/getting-started/index.xml @@ -153,7 +153,7 @@ <ul> <li>Upgrade to Docker <a href="https://www.docker.com/products/docker">Native</a> for Mac/Windows (Recommended). Check out <a href="http://laradock.io/documentation/#upgrading-laradock">Upgrading Laradock</a></li> -<li>Use Laradock v3.*. Visit the <a href="https://github.com/laradock/laradock/tree/LaraDock-ToolBox">LaraDock-ToolBox</a> branch. <em>(outdated)</em></li> +<li>Use Laradock v3.*. Visit the <a href="https://github.com/laradock/laradock/tree/Laradock-ToolBox">Laradock-ToolBox</a> branch. <em>(outdated)</em></li> </ul> <p><br></p> @@ -218,4 +218,4 @@ - \ No newline at end of file + diff --git a/docs/index.html b/docs/index.html index 57d50362..a515354d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -614,7 +614,7 @@ PHP CLI - Composer - Git - Linuxbrew - Node - V8JS - Gulp - SQLite - xDebug - En


@@ -953,12 +953,12 @@ xdebug.remote_connect_back=1

To control the behavior of xDebug (in the php-fpm Container), you can run the following commands from the Laradock root folder, (at the same prompt where you run docker-compose):

-

Note: If ./xdebugPhpFpm doesn’t execute and gives Permission Denied error the problem can be that file xdebugPhpFpm doesn’t have execution access. This can be fixed by running chmod command with desired access permissions.

+

Note: If .php-fpm/xdebug doesn’t execute and gives Permission Denied error the problem can be that file xdebug doesn’t have execution access. This can be fixed by running chmod command with desired access permissions.


@@ -1954,7 +1954,7 @@ e) set it to true

$root@server:~# apt-get install git
 $root@server:~# git clone https://github.com/laravel/laravel
 $root@server:~# cd laravel
-$root@server:~/laravel/ git submodule add https://github.com/LaraDock/laradock.git
+$root@server:~/laravel/ git submodule add https://github.com/Laradock/laradock.git
 $root@server:~/laravel/ cd laradock
@@ -1964,7 +1964,7 @@ $root@server:~/laravel/ cd laradock $root@server:~/chmod +x /usr/local/bin/docker-compose -

Create Your LaraDock Containers

+

Create Your Laradock Containers

$root@server:~/laravel/laradock# docker-compose up -d nginx mysql
@@ -2144,7 +2144,7 @@ $root@server:~/laravel/laradock/caddy# docker-compose up -d mysql caddy @@ -2268,7 +2268,7 @@ xdebug.cli_color=1

Need to clean house first?

-

Make sure you are starting with a clean state. For example, do you have other LaraDock containers and images? +

Make sure you are starting with a clean state. For example, do you have other Laradock containers and images? Here are a few things I use to clean things up.