Updated to build 101.

Author: alankent

Dockerfile

@@ -32,14 +32,6 @@ ADD config/composer.json /var/www/magento2/composer.json
 ADD scripts/install-magento2 /var/www/install-magento2
 RUN bash -x /var/www/install-magento2
 
-# Add images used for demo queries.
-ADD media/MJ01-YE_main_cropped.jpg /var/www/magento2/htdocs/pub/media/catalog/product/m/j/mj01-ye_main_cropped.jpg
-ADD media/MJ01-YE_back_cropped.jpg /var/www/magento2/htdocs/pub/media/catalog/product/m/j/mj01-ye_back_cropped.jpg
-ADD media/MJ03-GN_main_cropped.jpg /var/www/magento2/htdocs/pub/media/catalog/product/m/j/mj03-gn_main_cropped.jpg
-ADD media/MJ07-BL_main_cropped.jpg /var/www/magento2/htdocs/pub/media/catalog/product/m/j/mj07-bl_main_cropped.jpg
-ADD dump/magento2.sql /var/www/magento2/magento2.sql
-RUN chown www-data:www-data -R /var/www/magento2/htdocs/pub/media/catalog
-
 # Expose the web server port
 EXPOSE 80
 

README.md

@@ -28,7 +28,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-alpha100
+       alankent/docker-magento2-demo-apache:0.1.0-alpha101
 
 When this container is started, it loops waiting for a succesful
 connection to the MySQL database. Once achieved it runs a PHP script
@@ -53,3 +53,6 @@ intended for production usage!)
 
 Be aware if you start a new container instance, it will wipe the
 database and start again.
+
+This script currently does not load up any products - it is more to
+demonstrate the installation steps. Sample data is "coming soon".

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-alpha100
-echo docker push alankent/docker-magento2-demo-apache:0.1.0-alpha100
+echo docker tag docker-magento2-demo-apache alankent/docker-magento2-demo-apache:0.1.0-alpha101
+echo docker push alankent/docker-magento2-demo-apache:0.1.0-alpha101

config/composer.json

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

dump/magento2.sql

@@ -10,17 +10,15 @@ mkdir -p htdocs
 curl -sS https://getcomposer.org/installer | php
 php composer.phar install --profile
 
-# TEMPORARY FIX - a unit test snuck into alpha99 in wrong directory
-rm -rf htdocs/app/code/Magento/CatalogSearch/Model/Search/CatalogTest.php
-
 cd htdocs
 php -f dev/tools/Magento/Tools/View/deploy.php
 php -f dev/tools/Magento/Tools/Di/compiler.php
 
 # Use developer mode to get more detailed error diagnostics, at least for now.
-#echo "SetEnv MAGE_MODE production" >> .htaccess
 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
 

scripts/install-magento2

@@ -32,15 +32,12 @@ if [ ! -f /var/www/magento2/htdocs/app/etc/local.xml ]; then
 		--currency=USD \
 		--admin_lastname=Smith \
 		--admin_firstname=John \
-		--admin_email=a@m.com \
+		--admin_email=john.smith@example.com \
 		--admin_username=admin \
 		--admin_password=admin123 \
 		--use_secure=0
     )
 fi
 
-# Until the sample data loading script is available, load up this database dump.
-#mysql $MYSQLAUTH magento2 < /var/www/magento2/magento2.sql
-
 # Run the web server
 exec /usr/sbin/apache2 -D FOREGROUND