From ef6071bff0d745f8aee2d7376dcb21f49ff11668 Mon Sep 17 00:00:00 2001 From: Winfried Date: Sun, 23 Apr 2017 21:16:58 +0200 Subject: [PATCH 1/9] Fixing typo in the workspace V8 args --- docker-compose.yml | 2 +- env-example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8020d2d1..938fca4f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,7 @@ services: - INSTALL_YARN=${WORKSPACE_INSTALL_YARN} - INSTALL_DRUSH=${WORKSPACE_INSTALL_DRUSH} - INSTALL_AEROSPIKE_EXTENSION=${WORKSPACE_INSTALL_AEROSPIKE_EXTENSION} - - INSTALL_V8JS_EXTENSION=${WORKSPACE_INSTALL_INSTALL_V8JS_EXTENSION} + - INSTALL_V8JS_EXTENSION=${WORKSPACE_INSTALL_V8JS_EXTENSION} - COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL} - INSTALL_WORKSPACE_SSH=${WORKSPACE_INSTALL_WORKSPACE_SSH} - INSTALL_LARAVEL_ENVOY=${WORKSPACE_INSTALL_LARAVEL_ENVOY} diff --git a/env-example b/env-example index 3ba06708..523a4e28 100644 --- a/env-example +++ b/env-example @@ -36,7 +36,7 @@ WORKSPACE_INSTALL_NODE=false WORKSPACE_INSTALL_YARN=false WORKSPACE_INSTALL_DRUSH=false WORKSPACE_INSTALL_AEROSPIKE_EXTENSION=false -WORKSPACE_INSTALL_INSTALL_V8JS_EXTENSION=false +WORKSPACE_INSTALL_V8JS_EXTENSION=false WORKSPACE_COMPOSER_GLOBAL_INSTALL=false WORKSPACE_INSTALL_WORKSPACE_SSH=false WORKSPACE_INSTALL_LARAVEL_ENVOY=false From 49f245b37a77efe5338344fa7a4416ff8f61b0d8 Mon Sep 17 00:00:00 2001 From: Winfried Date: Sun, 23 Apr 2017 21:29:18 +0200 Subject: [PATCH 2/9] Add apt update to intl intall Fixes #847 --- php-fpm/Dockerfile-71 | 1 + 1 file changed, 1 insertion(+) diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 68ff65af..7dd11094 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -212,6 +212,7 @@ RUN if [ ${INSTALL_TOKENIZER} = true ]; then \ ARG INSTALL_INTL=false RUN if [ ${INSTALL_INTL} = true ]; then \ # Install intl and requirements + apt-get -y update && \ apt-get install -y zlib1g-dev libicu-dev g++ && \ docker-php-ext-configure intl && \ docker-php-ext-install intl \ From c6bd305b138054a27ea1cd2fb4d466a749b8f415 Mon Sep 17 00:00:00 2001 From: Winfried Date: Sun, 23 Apr 2017 23:19:56 +0200 Subject: [PATCH 3/9] Fixing soap being loaded twice --- workspace/Dockerfile-56 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 9b05eae7..8e69967f 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -62,8 +62,7 @@ RUN if [ ${INSTALL_SOAP} = true ]; then \ # Install the PHP SOAP extension apt-get -y update && \ add-apt-repository -y ppa:ondrej/php && \ - apt-get -y install libxml2-dev php5.6-soap && \ - echo "extension=soap.so" >> /etc/php/5.6/cli/conf.d/40-soap.ini \ + apt-get -y install libxml2-dev php5.6-soap \ ;fi ##################################### From 1db18b1cecaab88121bf0d3fbb99988998f9cbda Mon Sep 17 00:00:00 2001 From: Winfried Date: Sun, 23 Apr 2017 23:40:27 +0200 Subject: [PATCH 4/9] Changing PMA/adminer default port to 8080 Fixes issue #828 --- DOCUMENTATION/content/documentation/index.md | 2 ++ env-example | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index 48df261f..e8129d7e 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -699,6 +699,8 @@ docker-compose up -d mysql phpmyadmin docker-compose up -d mariadb phpmyadmin ``` +*Note: To use with MariaDB, open `.env` and set `PMA_DB_ENGINE=mysql` to `PMA_DB_ENGINE=mariadb`.* + 2 - Open your browser and visit the localhost on port **8080**: `http://localhost:8080` diff --git a/env-example b/env-example index 3ba06708..d87d596b 100644 --- a/env-example +++ b/env-example @@ -156,7 +156,7 @@ MINIO_PORT=9000 ### ADMINER ############################################################################################################ -ADM_PORT=88 +ADM_PORT=8080 ### PHP MY ADMIN ####################################################################################################### @@ -169,7 +169,7 @@ PMA_DB_ENGINE=mysql PMA_USER=default PMA_PASSWORD=secret PMA_ROOT_PASSWORD=secret -PMA_PORT=88 +PMA_PORT=8080 ### VARNISH ############################################################################################################ From 4bf0df8ee1b80969b5b7ad98b4106aa6b3cfb431 Mon Sep 17 00:00:00 2001 From: Winfried Date: Sun, 23 Apr 2017 23:57:47 +0200 Subject: [PATCH 5/9] Locking Adminer to stable version --- DOCUMENTATION/content/documentation/index.md | 1 + adminer/Dockerfile | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index 48df261f..9477827f 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -718,6 +718,7 @@ docker-compose up -d adminer 2 - Open your browser and visit the localhost on port **8080**: `http://localhost:8080` +**Note:** We've locked Adminer to version 4.3.0 as at the time of writing [it contained a major bug](https://sourceforge.net/p/adminer/bugs-and-features/548/) preventing PostgreSQL users from logging in. If that bug is fixed (or if you're not using PostgreSQL) feel free to set Adminer to the latest version within [the Dockerfile](https://github.com/laradock/laradock/blob/master/adminer/Dockerfile#L1): `FROM adminer:latest` diff --git a/adminer/Dockerfile b/adminer/Dockerfile index 058170cc..6117454f 100644 --- a/adminer/Dockerfile +++ b/adminer/Dockerfile @@ -1,4 +1,7 @@ -FROM adminer:latest +FROM adminer:4.3.0 + +# Version 4.3.1 contains PostgreSQL login errors. See docs. +# See https://sourceforge.net/p/adminer/bugs-and-features/548/ MAINTAINER Patrick Artounian From dde95043f89a75a16fdb45b90fa989883f68980e Mon Sep 17 00:00:00 2001 From: Winfried Date: Mon, 24 Apr 2017 00:07:07 +0200 Subject: [PATCH 6/9] Updating workspace to use latest base image --- workspace/Dockerfile-56 | 2 +- workspace/Dockerfile-70 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 9b05eae7..e6fe2e9c 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -12,7 +12,7 @@ # Note: Base Image name format {image-tag}-{php-version} # -FROM laradock/workspace:1.7-56 +FROM laradock/workspace:1.8-56 MAINTAINER Mahmoud Zalt diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index d197d727..ca87e403 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -12,7 +12,7 @@ # Note: Base Image name format {image-tag}-{php-version} # -FROM laradock/workspace:1.7-70 +FROM laradock/workspace:1.8-70 MAINTAINER Mahmoud Zalt From 6348d032c95dba47ea7ae88fbfcdc9dbb902f030 Mon Sep 17 00:00:00 2001 From: Mahmoud Zalt Date: Mon, 24 Apr 2017 20:49:25 -0400 Subject: [PATCH 7/9] random docs updates --- DOCUMENTATION/content/getting-started/index.md | 17 ++++++++--------- DOCUMENTATION/content/index.md | 7 ------- 2 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 DOCUMENTATION/content/index.md diff --git a/DOCUMENTATION/content/getting-started/index.md b/DOCUMENTATION/content/getting-started/index.md index 9172688d..e0a35642 100644 --- a/DOCUMENTATION/content/getting-started/index.md +++ b/DOCUMENTATION/content/getting-started/index.md @@ -39,23 +39,21 @@ Choose the setup the best suits your needs. git submodule add https://github.com/Laradock/laradock.git ``` -**Notes:** +Note: If you are not using Git yet for your project, you can use `git clone` instead of `git submodule `. -- If you are not using Git yet for your project, you can use `git clone` instead of `git submodule `. - -- Note 2: To keep track of your Laradock changes, between your projects and also keep Laradock updated. [Check this](/documentation/#keep-track-of-your-laradock-changes) +*To keep track of your Laradock changes, between your projects and also keep Laradock updated [check this docs](/documentation/#keep-track-of-your-laradock-changes)* Your folder structure should look like this: ``` + project-a - + laradock-a + + laradock-a + project-b - + laradock-b + + laradock-b ``` -(It's important to rename the folders differently in each project.) +*(It's important to rename the laradock folders to unique name in each project, if you want to run laradock per project).* > **Now jump to the [Usage](#Usage) section.** @@ -77,11 +75,12 @@ Your folder structure should look like this: 2 - Edit your web server sites configuration. -**In case of NGINX:** open `nginx/sites/default.conf` and change the `root` from `/var/www/public` to `/var/www/{my-project-folder-name}/public`. +**NGINX Example:** + +Open `nginx/sites/default.conf` and change the `root` from `/var/www/public` to `/var/www/{my-project-folder-name}/public`. *Or you can keep `default.conf` as it is, and create a separate config `my-site.conf` file for it.* -**In case of Apache:** :P
diff --git a/DOCUMENTATION/content/index.md b/DOCUMENTATION/content/index.md deleted file mode 100644 index 5556c125..00000000 --- a/DOCUMENTATION/content/index.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Welcome -type: index -weight: 0 ---- - -Welcome to Laradock :) From c7a726cd5983b1eb96f46d74a4a7e66c559bba52 Mon Sep 17 00:00:00 2001 From: lincome <59353073@qq.com> Date: Thu, 27 Apr 2017 15:05:35 +0800 Subject: [PATCH 8/9] =?UTF-8?q?Laravel=20=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README-zh.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README-zh.md b/README-zh.md index 9614e2e9..aa2a0d07 100644 --- a/README-zh.md +++ b/README-zh.md @@ -64,20 +64,23 @@ Laradock 努力简化创建开发环境过程。 让我们了解使用它安装 `NGINX`, `PHP`, `Composer`, `MySQL` 和 `Redis`，然后运行 `Laravel` 1. 将 Laradock 放到你的 Laravel 项目中： - ```bash git clone https://github.com/laradock/laradock.git ``` -2. 进入 Laradock 目录，然后运行这些容器。 +2. 进入 Laradock 目录 + ```bash +cp env-example .env +``` +3. 运行这些容器。 ```bash docker-compose up -d nginx mysql redis ``` -3. 打开你的 `.env` 文件，然后设置 `mysql` 的 `DB_HOST` 和 `redis` 的`REDIS_HOST`。 +4. 打开你的Laravel 项目的 `.env` 文件，然后设置 `mysql` 的 `DB_HOST` 和 `redis` 的`REDIS_HOST`。 -4. 打开浏览器，访问 localhost： +5. 打开浏览器，访问 localhost： ### 特点 @@ -461,7 +464,7 @@ REDIS_HOST=redis ], ``` -3 - 启用 Redis 缓存或者开启 Session 管理也在 `.env` 文件中用 `redis` 替换默认 `file` 设置 `CACHE_DRIVER` 和 `SESSION_DRIVER` +3 - 启用 Redis 缓存或者开启 Session 管理也在 `.env` 文件中用 `redis` 替换默认 `file` 设置 `CACHE_DRIVER` 和 `SESSION_DRIVER` ```env CACHE_DRIVER=redis From ae72b00e294cdd4eecd29fad46703df41cb923e7 Mon Sep 17 00:00:00 2001 From: Bruno Briante Date: Fri, 28 Apr 2017 03:24:06 -0300 Subject: [PATCH 9/9] Fix image path on doc guides The guides page was showing broken images as the url for those was not taking into consideration the url rewrite. I just added a slash in front of all those urls to serve them from root images folder instead. --- DOCUMENTATION/content/guides/index.md | 54 +++++++++++++-------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/DOCUMENTATION/content/guides/index.md b/DOCUMENTATION/content/guides/index.md index 34b92236..5cb6ddc8 100644 --- a/DOCUMENTATION/content/guides/index.md +++ b/DOCUMENTATION/content/guides/index.md @@ -428,54 +428,54 @@ If you have enabled `xdebug=true` in `docker-compose.yml/php-fpm`, `xdebug` will ## PHPStorm Settings - Here are some settings that are known to work: - `Settings/BuildDeploymentConnection` - - ![Settings/BuildDeploymentConnection](images/photos/PHPStorm/Settings/BuildDeploymentConnection.png) + - ![Settings/BuildDeploymentConnection](/images/photos/PHPStorm/Settings/BuildDeploymentConnection.png) - `Settings/BuildDeploymentConnectionMappings` - - ![Settings/BuildDeploymentConnectionMappings](images/photos/PHPStorm/Settings/BuildDeploymentConnectionMappings.png) + - ![Settings/BuildDeploymentConnectionMappings](/images/photos/PHPStorm/Settings/BuildDeploymentConnectionMappings.png) - `Settings/BuildDeploymentDebugger` - - ![Settings/BuildDeploymentDebugger](images/photos/PHPStorm/Settings/BuildDeploymentDebugger.png) + - ![Settings/BuildDeploymentDebugger](/images/photos/PHPStorm/Settings/BuildDeploymentDebugger.png) - `Settings/EditRunConfigurationRemoteWebDebug` - - ![Settings/EditRunConfigurationRemoteWebDebug](images/photos/PHPStorm/Settings/EditRunConfigurationRemoteWebDebug.png) + - ![Settings/EditRunConfigurationRemoteWebDebug](/images/photos/PHPStorm/Settings/EditRunConfigurationRemoteWebDebug.png) - `Settings/EditRunConfigurationRemoteExampleTestDebug` - - ![Settings/EditRunConfigurationRemoteExampleTestDebug](images/photos/PHPStorm/Settings/EditRunConfigurationRemoteExampleTestDebug.png) + - ![Settings/EditRunConfigurationRemoteExampleTestDebug](/images/photos/PHPStorm/Settings/EditRunConfigurationRemoteExampleTestDebug.png) - `Settings/LangsPHPDebug` - - ![Settings/LangsPHPDebug](images/photos/PHPStorm/Settings/LangsPHPDebug.png) + - ![Settings/LangsPHPDebug](/images/photos/PHPStorm/Settings/LangsPHPDebug.png) - `Settings/LangsPHPInterpreters` - - ![Settings/LangsPHPInterpreters](images/photos/PHPStorm/Settings/LangsPHPInterpreters.png) + - ![Settings/LangsPHPInterpreters](/images/photos/PHPStorm/Settings/LangsPHPInterpreters.png) - `Settings/LangsPHPPHPUnit` - - ![Settings/LangsPHPPHPUnit](images/photos/PHPStorm/Settings/LangsPHPPHPUnit.png) + - ![Settings/LangsPHPPHPUnit](/images/photos/PHPStorm/Settings/LangsPHPPHPUnit.png) - `Settings/LangsPHPServers` - - ![Settings/LangsPHPServers](images/photos/PHPStorm/Settings/LangsPHPServers.png) + - ![Settings/LangsPHPServers](/images/photos/PHPStorm/Settings/LangsPHPServers.png) - `RemoteHost` To switch on this view, go to: `Menu/Tools/Deployment/Browse Remote Host`. - - ![RemoteHost](images/photos/PHPStorm/RemoteHost.png) + - ![RemoteHost](/images/photos/PHPStorm/RemoteHost.png) - `RemoteWebDebug` - - ![DebugRemoteOn](images/photos/PHPStorm/DebugRemoteOn.png) + - ![DebugRemoteOn](/images/photos/PHPStorm/DebugRemoteOn.png) - `EditRunConfigurationRemoteWebDebug` Go to: `Menu/Run/Edit Configurations`. - - ![EditRunConfigurationRemoteWebDebug](images/photos/PHPStorm/Settings/EditRunConfigurationRemoteWebDebug.png) + - ![EditRunConfigurationRemoteWebDebug](/images/photos/PHPStorm/Settings/EditRunConfigurationRemoteWebDebug.png) - `EditRunConfigurationRemoteExampleTestDebug` Go to: `Menu/Run/Edit Configurations`. - - ![EditRunConfigurationRemoteExampleTestDebug](images/photos/PHPStorm/Settings/EditRunConfigurationRemoteExampleTestDebug.png) + - ![EditRunConfigurationRemoteExampleTestDebug](/images/photos/PHPStorm/Settings/EditRunConfigurationRemoteExampleTestDebug.png) - `WindowsFirewallAllowedApps` Go to: `Control Panel\All Control Panel Items\Windows Firewall\Allowed apps`. - - ![WindowsFirewallAllowedApps.png](images/photos/PHPStorm/Settings/WindowsFirewallAllowedApps.png) + - ![WindowsFirewallAllowedApps.png](/images/photos/PHPStorm/Settings/WindowsFirewallAllowedApps.png) - `hosts` Edit: `C:\Windows\System32\drivers\etc\hosts`. - - ![WindowsFirewallAllowedApps.png](images/photos/PHPStorm/Settings/hosts.png) + - ![WindowsFirewallAllowedApps.png](/images/photos/PHPStorm/Settings/hosts.png) - [Enable xDebug on php-fpm](#enablePhpXdebug) @@ -497,7 +497,7 @@ If you have enabled `xdebug=true` in `docker-compose.yml/php-fpm`, `xdebug` will - right-click on `tests/ExampleTest.php` - Select: `Debug 'ExampleTest.php'`. - Should have stopped at the BreakPoint!! You are now debugging locally against a remote Laravel project via SSH! - - ![Remote Test Debugging Success](images/photos/PHPStorm/RemoteTestDebuggingSuccess.png) + - ![Remote Test Debugging Success](/images/photos/PHPStorm/RemoteTestDebuggingSuccess.png) @@ -508,13 +508,13 @@ If you have enabled `xdebug=true` in `docker-compose.yml/php-fpm`, `xdebug` will `.php-fpm/xdebug stop` - Start Remote Debugging - - ![DebugRemoteOn](images/photos/PHPStorm/DebugRemoteOn.png) + - ![DebugRemoteOn](/images/photos/PHPStorm/DebugRemoteOn.png) - Open to edit: `bootstrap/app.php` - Add a BreakPoint on line 14: `$app = new Illuminate\Foundation\Application(` - Reload [Laravel Site](http://laravel/) - Should have stopped at the BreakPoint!! You are now debugging locally against a remote Laravel project via SSH! - - ![Remote Debugging Success](images/photos/PHPStorm/RemoteDebuggingSuccess.png) + - ![Remote Debugging Success](/images/photos/PHPStorm/RemoteDebuggingSuccess.png) @@ -533,14 +533,14 @@ Assuming that you are in laradock folder, type: [Kitty](http://www.9bis.net/kitty/) KiTTY is a fork from version 0.67 of PuTTY. - Here are some settings that are working for me: - - ![Session](images/photos/KiTTY/Session.png) - - ![Terminal](images/photos/KiTTY/Terminal.png) - - ![Window](images/photos/KiTTY/Window.png) - - ![WindowAppearance](images/photos/KiTTY/WindowAppearance.png) - - ![Connection](images/photos/KiTTY/Connection.png) - - ![ConnectionData](images/photos/KiTTY/ConnectionData.png) - - ![ConnectionSSH](images/photos/KiTTY/ConnectionSSH.png) - - ![ConnectionSSHAuth](images/photos/KiTTY/ConnectionSSHAuth.png) - - ![TerminalShell](images/photos/KiTTY/TerminalShell.png) + - ![Session](/images/photos/KiTTY/Session.png) + - ![Terminal](/images/photos/KiTTY/Terminal.png) + - ![Window](/images/photos/KiTTY/Window.png) + - ![WindowAppearance](/images/photos/KiTTY/WindowAppearance.png) + - ![Connection](/images/photos/KiTTY/Connection.png) + - ![ConnectionData](/images/photos/KiTTY/ConnectionData.png) + - ![ConnectionSSH](/images/photos/KiTTY/ConnectionSSH.png) + - ![ConnectionSSHAuth](/images/photos/KiTTY/ConnectionSSHAuth.png) + - ![TerminalShell](/images/photos/KiTTY/TerminalShell.png)