Merge branch 'master' of https://github.com/alankent/docker-magento2-demo-apache

Author: Alan Kent

Diff for: Dockerfile

@@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y apache2 mysql-client php5 php5-curl php
 
 # mcrypt.ini appears to be missing from apt-get install. Needed for PHP mcrypt library to be enabled.
 ADD config/20-mcrypt.ini /etc/php5/cli/conf.d/20-mcrypt.ini
+ADD config/20-mcrypt.ini /etc/php5/apache2/conf.d/20-mcrypt.ini
 
 # Environment variables from /etc/apache2/apache2.conf
 ENV APACHE_RUN_USER www-data
@@ -19,7 +20,8 @@ ENV APACHE_PID_FILE /var/run/apache2/apache2.pid
 RUN a2enmod rewrite
 
 # Add the Apache virtual host file
-ADD config/apache_default_vhost /etc/apache2/sites-available/default
+ADD config/apache_default_vhost /etc/apache2/sites-enabled/magento2.conf
+RUN rm -f /etc/apache2/sites-enabled/000-default.conf
 
 # Add the MySQL client configuration file (no server settings)
 ADD config/my.cnf /etc/mysql/my.cnf
@@ -53,4 +55,6 @@ EXPOSE 80
 
 # Start up the Apache server
 ADD scripts/runserver /usr/local/bin/runserver
-ENTRYPOINT ["/usr/local/bin/runserver"]
+RUN chmod +x /usr/local/bin/runserver
+ENTRYPOINT ["bash", "-c"]
+CMD ["/usr/local/bin/runserver"]

Diff for: build.sh

@@ -1,3 +1,9 @@
 #!/bin/bash
 
 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-alpha89
+echo docker push alankent/docker-magento2-demo-apache
+echo docker push alankent/docker-magento2-demo-apache:0.1.0-alpha89

Diff for: config/apache_default_vhost

@@ -3,7 +3,7 @@
   DocumentRoot /var/www/magento2/htdocs
 
   <Directory /var/www/magento2/htdocs>
-    Options Indexes FollowSymLinks -MultiViews
+    Options Indexes FollowSymLinks
     AllowOverride All
     Order allow,deny
     allow from all

Diff for: run.sh

@@ -1 +1 @@
-docker run --name magento2 -i -t -p 80:80 --link mysql:mysql docker-magento2-demo-apache bash
+docker run --rm --name magento2 -i -t -p 80:80 --link mysql:mysql -e MYSQL_USER=root -e MYSQL_PASSWORD=admin -e PUBLIC_HOST=coreos-1-5920.lvs01.dev.ebayc3.com docker-magento2-demo-apache $*

Diff for: scripts/create-database

@@ -14,6 +14,7 @@ cd htdocs
 php -f dev/tools/Magento/Tools/View/deploy.php
 php -f dev/tools/Magento/Tools/Di/compiler.php
 
-echo "SetEnv MAGE_MODE production" >> .htaccess
+#echo "SetEnv MAGE_MODE production" >> .htaccess
+echo "SetEnv MAGE_MODE developer" >> .htaccess
 
 chown www-data:www-data -R /var/www/magento2

Diff for: scripts/install-magento2

@@ -1,7 +1,10 @@
 #!/bin/bash
 
+# Show what we execute
+set -x
+
 # MySQL authentication
-MYSQLAUTH="--user=\"$MYSQL_USER\" --password=\"$MYSQL_PASSWORD\""
+MYSQLAUTH="--user=$MYSQL_USER --password=$MYSQL_PASSWORD"
 
 # Wait for MySQL to come up.
 until mysql $MYSQLAUTH -e ""; do
@@ -13,20 +16,29 @@ done
 mysql $MYSQLAUTH -e "CREATE DATABASE IF NOT EXISTS magento2;"
 
 # Create the Magento local.xml file
-sed < /var/www/magento2/htdocs/app/etc/local.xml.template \
-    -e "s/{{date}}/<![CDATA[`date`]]>/" \
-    -e "s/{{key}}/bfabadc79e44be389494390b63c42114/" \
-    -e "s/{{db_prefix}}//" \
-    -e "s/{{db_host}}/mysql/" \
-    -e "s/{{db_user}}/$MYSQL_USER/" \
-    -e "s/{{db_pass}}/$MYSQL_PASSWORD/" \
-    -e "s/{{db_name}}/magento2/" \
-    -e "s/{{db_init_statements}}/SET NAMES utf8/" \
-    -e "s/{{db_model}}/mysql4/" \
-    -e "s/{{session_save}}/files/" \
-    -e "s/{{backend_frontname}}/backend/" \
-    > /var/www/magento2/htdocs/app/etc/local.xml
+if [ ! -f /var/www/magento2/htdocs/app/etc/local.xml ]; then
+    php -f /var/www/magento2/htdocs/dev/shell/install.php -- \
+	--license_agreement_accepted yes \
+	--locale en_US \
+	--timezone "America/Los_Angeles" \
+	--default_currency USD \
+	--db_host mysql \
+	--db_name magento2 \
+	--db_user "$MYSQL_USER" \
+	--db_pass "$MYSQL_PASSWORD" \
+	--url "http://$PUBLIC_HOST/" \
+	--use_rewrites no \
+	--use_secure_admin yes \
+	--admin_lastname Smith \
+	--admin_firstname John \
+	--admin_email "[email protected]" \
+	--admin_username admin \
+	--admin_password admin123 \
+	--use_secure no \
+	--secure_base_url "https://$PUBLIC_HOST/" \
+        --skip_url_validation \
+	--cleanup_database
+fi
 
 # Run the web server
-echo exec /usr/sbin/apache2 -D FOREGROUND
-bash
+exec /usr/sbin/apache2 -D FOREGROUND