Bonjour reserves *.local domains #14. Removed extra docker-compose.yml file from README (maintenance/pr issues). Added explicit port naming for local development environment setups.

README.md

@@ -10,74 +10,6 @@ View our Docker Hub images at [https://hub.docker.com/u/mageinferno/](https://hu
 
 This file is provided as an example development environment using Mage Inferno Magento 2 Docker Images.
 
-## docker-compose.yml
-
-```
-# Mage Inferno Docker Compose (https://github.com/mageinferno/magento2-docker-compose)
-# Version 4.0.0
-
-app:
-  image: mageinferno/magento2-nginx:1.9.14-0
-  links:
-    - phpfpm
-    - db
-  volumes_from:
-    - appdata
-  ports:
-    - 80:80
-
-appdata:
-  image: tianon/true
-  volumes:
-    - /srv/www
-#    - ~/.composer:/var/www/.composer
-#    - ./www/app/code:/srv/www/app/code
-
-phpfpm:
-  image: mageinferno/magento2-php:7.0.5-fpm-0
-  links:
-    - db
-  volumes_from:
-    - appdata
-
-db:
-  image: mariadb:10.1.13
-  volumes_from:
-    - dbdata
-  environment:
-    - MYSQL_ROOT_PASSWORD=magento2
-    - MYSQL_DATABASE=magento2
-    - MYSQL_USER=magento2
-    - MYSQL_PASSWORD=magento2
-
-dbdata:
-  image: tianon/true
-  volumes:
-    - /var/lib/mysql
-
-setup:
-  image: mageinferno/magento2-php:7.0.5-fpm-0
-  command: /usr/local/bin/mage-setup
-  links:
-    - db
-  volumes_from:
-    - appdata
-  environment:
-    - M2SETUP_DB_HOST=db
-    - M2SETUP_DB_NAME=magento2
-    - M2SETUP_DB_USER=magento2
-    - M2SETUP_DB_PASSWORD=magento2
-    - M2SETUP_BASE_URL=http://docker.local/
-    - M2SETUP_ADMIN_FIRSTNAME=Admin
-    - M2SETUP_ADMIN_LASTNAME=User
-    - M2SETUP_ADMIN_EMAIL=dummy@gmail.com
-    - M2SETUP_ADMIN_USER=magento2
-    - M2SETUP_ADMIN_PASSWORD=magento2
-    - M2SETUP_VERSION=2.0.4
-    - M2SETUP_USE_SAMPLE_DATA=false
-    - M2SETUP_USE_ARCHIVE=true
-```
-
 ## Composer Setup
 
 Uncomment the composer line from `appdata` to mount a `.composer` directory to the `www-data` user home directory. Please first setup Magento Marketplace authentication (details at <a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/connect-auth.html" target="_blank">http://devdocs.magento.com/guides/v2.0/install-gde/prereq/connect-auth.html</a>).

docker-compose.yml

@@ -1,5 +1,5 @@
 # Mage Inferno Docker Compose (https://github.com/mageinferno/magento2-docker-compose)
-# Version 4.0.0
+# Version 4.1.0
 
 app:
   image: mageinferno/magento2-nginx:1.9.14-0
@@ -9,7 +9,7 @@ app:
   volumes_from:
     - appdata
   ports:
-    - 80:80
+    - 8000:80
 
 appdata:
   image: tianon/true
@@ -29,6 +29,8 @@ db:
   image: mariadb:10.1.13
   volumes_from:
     - dbdata
+  ports:
+    - 8001:3306
   environment:
     - MYSQL_ROOT_PASSWORD=magento2
     - MYSQL_DATABASE=magento2
@@ -52,12 +54,12 @@ setup:
     - M2SETUP_DB_NAME=magento2
     - M2SETUP_DB_USER=magento2
     - M2SETUP_DB_PASSWORD=magento2
-    - M2SETUP_BASE_URL=http://docker.local/
+    - M2SETUP_BASE_URL=http://m2.dev:8000/
     - M2SETUP_ADMIN_FIRSTNAME=Admin
     - M2SETUP_ADMIN_LASTNAME=User
     - M2SETUP_ADMIN_EMAIL=dummy@gmail.com
     - M2SETUP_ADMIN_USER=magento2
     - M2SETUP_ADMIN_PASSWORD=magento2
-    - M2SETUP_VERSION=2.0.4
+    - M2SETUP_VERSION=2.0.5
     - M2SETUP_USE_SAMPLE_DATA=false
     - M2SETUP_USE_ARCHIVE=true