Merge pull request #2 from otoolec/master

Update to dev beta6

Author: alankent

README.md

@@ -34,7 +34,7 @@ several additional environment variables.
     docker run --rm --name magento2 -p 80:80 --link mysql:mysql \
        -e MYSQL_USER=root -e MYSQL_PASSWORD=admin \
        -e PUBLIC_HOST=yourhost.example.com \
-       alankent/docker-magento2-demo-apache:0.1.0-alpha108
+       alankent/docker-magento2-demo-apache:0.42.0-beta6
 
 When this container is started, it loops waiting for a succesful
 connection to the MySQL database. Once achieved it runs a PHP script

build.sh

@@ -4,5 +4,5 @@ docker build -t docker-magento2-demo-apache .
 
 echo To publish use:
 echo docker tag docker-magento2-demo-apache alankent/docker-magento2-demo-apache
-echo docker tag docker-magento2-demo-apache alankent/docker-magento2-demo-apache:0.1.0-alpha108
-echo docker push alankent/docker-magento2-demo-apache:0.1.0-alpha108
+echo docker tag docker-magento2-demo-apache alankent/docker-magento2-demo-apache:0.42.0-beta6
+echo docker push alankent/docker-magento2-demo-apache:0.42.0-beta6

config/composer.json

@@ -1,55 +1,22 @@
 {
   "name": "alankent/store",
   "require": {
-    "magento/magento-composer-installer": "*",
-    "magento/product-community-edition": "0.1.0-alpha108"
+    "magento/product-community-edition": "0.42.0-beta6"
   },
   "repositories": [
     {
       "type": "composer",
       "url": "http://packages.magento.com/"
     }
   ],
+  "autoload": {
+    "psr-4": {
+      "Magento\\Setup\\": "htdocs/setup/module/Magento/Setup/src/"
+    }
+  },
   "extra": {
     "magento-root-dir": "htdocs",
     "magento-deploystrategy": "copy"
   },
-  "minimum-stability": "dev",
-  "autoload": {
-        "psr-0": {
-            "Apache_": "htdocs/lib/internal/",
-            "Cm_": "htdocs/lib/internal/",
-            "Credis_": "htdocs/lib/internal/",
-            "Less_": "htdocs/lib/internal/",
-            "Symfony\\": "htdocs/lib/internal/",
-            "Zend_Date": "htdocs/app/code/",
-            "Zend_Mime": "htdocs/app/code/",
-            "Zend_": "htdocs/lib/internal/",
-            "Zend\\": "htdocs/lib/internal/"
-        },
-        "psr-4": {
-            "Magento\\Framework\\": "htdocs/lib/internal/Magento/Framework/",
-            "Magento\\": [
-                "htdocs/var/generation/Magento/",
-                "htdocs/app/code/Magento/"
-            ],
-            "Zend\\Soap\\": "htdocs/app/code/Zend/Soap/",
-            "Zend\\": "htdocs/lib/internal/Zend/"
-        }
-    },
-    "include-path": [
-        "/htdocs/lib/internal/",
-        "/htdocs/app/code/"
-    ],
-    "autoload-dev": {
-        "psr-4": {
-            "Magento\\Sniffs\\": "htdocs/dev/tests/static/framework/Magento/Sniffs/",
-            "Magento\\Tools\\": "htdocs/dev/tools/Magento/Tools/",
-            "Magento\\Tools\\License\\": "htdocs/dev/build/publication/license/",
-            "Magento\\Tools\\Sanity\\": "htdocs/dev/build/publication/sanity/Magento/Tools/Sanity/",
-            "Magento\\TestFramework\\Inspection\\": "htdocs/dev/tests/static/framework/Magento/TestFramework/Inspection/",
-            "Magento\\TestFramework\\Utility\\": "htdocs/dev/tests/static/framework/Magento/TestFramework/Utility/",
-            "Magento\\ToolkitFramework\\": "htdocs/dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/"
-        }
-    }
+  "minimum-stability": "dev"
 }