Step towards build 108

Author: alankent

README.md

@@ -17,7 +17,13 @@ To run the default 'mysql' container, please name the container 'mysql'
 and expose port 3306 for the Magento 2 container to use. For the purpose
 of this demo, set the 'root' account password to 'admin'.
 
-    docker run --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=admin mysql
+    docker run -d --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=admin \
+       mysql:5.6
+
+Do check that it started up (the -d makes it run as a daemon in
+background) use
+
+    docker logs mysql
 
 An interestiong experiment for the reader is to replace the 'mysql'
 container with a Maria DB instance.
@@ -28,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-alpha102
+       alankent/docker-magento2-demo-apache:0.1.0-alpha108
 
 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-alpha102
-echo docker push alankent/docker-magento2-demo-apache:0.1.0-alpha102
+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

config/composer.json

@@ -2,7 +2,7 @@
   "name": "alankent/store",
   "require": {
     "magento/magento-composer-installer": "*",
-    "magento/product-community-edition": "0.1.0-alpha106"
+    "magento/product-community-edition": "0.1.0-alpha108"
   },
   "repositories": [
     {

scripts/install-magento2

@@ -8,7 +8,7 @@ rm -rf htdocs
 mkdir -p htdocs
 
 curl -sS https://getcomposer.org/installer | php
-php composer.phar install --profile
+php composer.phar install
 
 cd htdocs
 php -f dev/tools/Magento/Tools/View/deploy.php
@@ -18,8 +18,4 @@ php -f dev/tools/Magento/Tools/Di/compiler.php
 echo "SetEnv MAGE_MODE developer" >> .htaccess
 #echo "SetEnv MAGE_MODE production" >> .htaccess
 
-# Setup script is independent to main site - set it up too.
-cd setup
-COMPOSER_PROCESS_TIMEOUT=1000 php ../../composer.phar install --profile
-
 chown www-data:www-data -R /var/www/magento2

scripts/runserver

@@ -14,29 +14,24 @@ done
 
 mysql $MYSQLAUTH -e "CREATE DATABASE IF NOT EXISTS magento2"
 
-# Create the Magento local.xml file
-if [ ! -f /var/www/magento2/htdocs/app/etc/local.xml ]; then
-    (
-	cd /var/www/magento2/htdocs/setup
-	php -f index.php install \
-		--cleanup_database \
-		--db_host=mysql \
-		--db_name=magento2 \
-		--db_user="$MYSQL_USER" \
-		--db_pass="$MYSQL_PASSWORD" \
-		--backend_frontname=admin \
-		--base_url=http://$PUBLIC_HOST/ \
-		--language=en_US \
-		--timezone=America/Los_Angeles \
-		--currency=USD \
-		--admin_lastname=Smith \
-		--admin_firstname=John \
-		[email protected] \
-		--admin_username=admin \
-		--admin_password=admin123 \
-		--use_secure=0
-    )
-fi
+cd /var/www/magento2/htdocs/setup
+php -f setup/index.php install \
+	--cleanup_database \
+	--db_host=mysql \
+	--db_name=magento2 \
+	--db_user="$MYSQL_USER" \
+	--db_pass="$MYSQL_PASSWORD" \
+	--backend_frontname=admin \
+	--base_url=http://$PUBLIC_HOST/ \
+	--language=en_US \
+	--timezone=America/Los_Angeles \
+	--currency=USD \
+	--admin_lastname=Smith \
+	--admin_firstname=John \
+	[email protected] \
+	--admin_username=admin \
+	--admin_password=admin123 \
+	--use_secure=0
 
 # Run the web server
 exec /usr/sbin/apache2 -D FOREGROUND