Merge pull request #2634 from bestlong/fix-port-conflict

fix bind port conflict

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
     "files.associations": {
         "Dockerfile-*": "dockerfile"
-    },
+    }
 }

DOCUMENTATION/content/documentation/index.md

@@ -400,7 +400,7 @@ Always download the latest version of [Loaders for ionCube ](http://www.ioncube.
 
 4 - Re-build the containers `docker-compose build workspace`
 
-[**Deployer Documentation Here**](https://deployer.org/docs)
+[**Deployer Documentation Here**](https://deployer.org/docs/getting-started.html)
 
 
 
@@ -977,7 +977,7 @@ 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`
+2 - Open your browser and visit the localhost on port **8081**:  `http://localhost:8081`
 
 
 
@@ -1074,7 +1074,7 @@ job1:
 docker-compose up -d adminer
 ```
 
-2 - Open your browser and visit the localhost on port **8080**:  `http://localhost:8080`
+2 - Open your browser and visit the localhost on port **8081**:  `http://localhost:8081`
 
 **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`
 

env-example

@@ -399,7 +399,7 @@ MINIO_PORT=9000
 
 ### ADMINER ###############################################
 
-ADM_PORT=8080
+ADM_PORT=8081
 ADM_INSTALL_MSSQL=false
 
 ### PHP MY ADMIN ##########################################
@@ -413,7 +413,7 @@ PMA_DB_ENGINE=mysql
 PMA_USER=default
 PMA_PASSWORD=secret
 PMA_ROOT_PASSWORD=secret
-PMA_PORT=8080
+PMA_PORT=8081
 
 ### MAILDEV ###############################################
 

php-fpm/xdebug

@@ -36,7 +36,7 @@ xdebug_start ()
 
     # And uncomment line with xdebug extension, thus enabling it
     ON_CMD="sed -i 's/^;zend_extension=/zend_extension=/g' \
-                    /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini"
+                    /usr/local/etc/php/conf.d/xdebug.ini"
 
 
     # If running on Windows, need to prepend with winpty :(
@@ -58,7 +58,7 @@ xdebug_stop ()
     echo 'Stop xDebug'
 
     # Comment out xdebug extension line
-    OFF_CMD="sed -i 's/^zend_extension=/;zend_extension=/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini"
+    OFF_CMD="sed -i 's/^zend_extension=/;zend_extension=/g' /usr/local/etc/php/conf.d/xdebug.ini"
 
 
     # If running on Windows, need to prepend with winpty :(