diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md
index 48df261f..8db3ee38 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`
@@ -718,6 +720,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/DOCUMENTATION/content/getting-started/index.md b/DOCUMENTATION/content/getting-started/index.md
index 3d50c225..b8783076 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 these 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.**
diff --git a/DOCUMENTATION/content/guides/index.md b/DOCUMENTATION/content/guides/index.md
index d109fd8a..927e3276 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/BuildDeploymentConnectionMappings`
- - 
+ - 
- `Settings/BuildDeploymentDebugger`
- - 
+ - 
- `Settings/EditRunConfigurationRemoteWebDebug`
- - 
+ - 
- `Settings/EditRunConfigurationRemoteExampleTestDebug`
- - 
+ - 
- `Settings/LangsPHPDebug`
- - 
+ - 
- `Settings/LangsPHPInterpreters`
- - 
+ - 
- `Settings/LangsPHPPHPUnit`
- - 
+ - 
- `Settings/LangsPHPServers`
- - 
+ - 
- `RemoteHost`
To switch on this view, go to: `Menu/Tools/Deployment/Browse Remote Host`.
- - 
+ - 
- `RemoteWebDebug`
- - 
+ - 
- `EditRunConfigurationRemoteWebDebug`
Go to: `Menu/Run/Edit Configurations`.
- - 
+ - 
- `EditRunConfigurationRemoteExampleTestDebug`
Go to: `Menu/Run/Edit Configurations`.
- - 
+ - 
- `WindowsFirewallAllowedApps`
Go to: `Control Panel\All Control Panel Items\Windows Firewall\Allowed apps`.
- - 
+ - 
- `hosts`
Edit: `C:\Windows\System32\drivers\etc\hosts`.
- - 
+ - 
- [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!
- - 
+ - 
@@ -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
- - 
+ - 
- 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!
- - 
+ - 
@@ -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:
- - 
- - 
- - 
- - 
- - 
- - 
- - 
- - 
- - 
+ - 
+ - 
+ - 
+ - 
+ - 
+ - 
+ - 
+ - 
+ - 
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 :)
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
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
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 64b37a06..fc6b8c45 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
@@ -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 ############################################################################################################
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 \
diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56
index 9b05eae7..1343ae91 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
@@ -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
#####################################
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