Fix Dockerfile (#1120)

Author: Jan Petr

dev/Dockerfile.base

@@ -1,22 +1,19 @@
-FROM occitech/magento:php7.0.0-apache
-
-# packages configuration
-RUN echo 'mysql-server mysql-server/root_password password P4ssw0rd' | debconf-set-selections
-RUN echo 'mysql-server mysql-server/root_password_again password P4ssw0rd' | debconf-set-selections
+FROM occitech/magento:php7.0-apache
 
 # packages/dependencies installation
-RUN systemctl mask mysql && apt-get update && apt-get install -y \
-  mysql-client-5.5 \
+RUN apt-get update && apt-get install -y \
   mysql-server \
   libxml2-dev \
   git-core \
-  wget && systemctl unmask mysql
+  wget
 
 RUN docker-php-ext-install soap
 RUN docker-php-ext-install mysqli
 
 COPY bin/php.ini /usr/local/etc/php/php.ini
 
+RUN sed -i -e 's/\/var\/www\/html/\/var\/www\/htdocs/' /etc/apache2/sites-enabled/000-default.conf
+
 ## download & install Magento
 ARG MAGENTO_VERSION
 
@@ -31,20 +28,25 @@ RUN cd /var/www/htdocs/skin && cp -R /tmp/magento-sample-data-1.9.0.0/skin/* .
 RUN chown -R www-data:www-data /var/www/htdocs
 
 ## database setup
-RUN find /var/lib/mysql -type f -exec touch {} \; && service mysql start && \
-	(echo "CREATE DATABASE magento" | mysql -u root --password=P4ssw0rd) && \
-	mysql -u root --password=P4ssw0rd magento < /tmp/magento-sample-data-1.9.0.0/magento_sample_data_for_1.9.0.0.sql && \
-	MYSQL_HOST=127.0.0.1 MYSQL_USER=root MYSQL_PASSWORD=P4ssw0rd MYSQL_DATABASE=magento MAGENTO_LOCALE=en_US MAGENTO_TIMEZONE=Europe/Paris MAGENTO_DEFAULT_CURRENCY=USD MAGENTO_URL=http://mymagentostore.com MAGENTO_ADMIN_FIRSTNAME=Admin MAGENTO_ADMIN_LASTNAME=MyStore [email protected] MAGENTO_ADMIN_USERNAME=admin MAGENTO_ADMIN_PASSWORD=magentorocks1 /usr/local/bin/install-magento && \
-	service mysql stop
+RUN service mysql start && \
+	mysql -u root -e "CREATE DATABASE magento;"
+
+RUN service mysql start && \
+	mysql -u root -e "CREATE USER 'magento'@'localhost' IDENTIFIED BY 'P4ssw0rd'; GRANT ALL PRIVILEGES ON *.* TO 'magento'@'localhost'; FLUSH PRIVILEGES;"
+
+RUN service mysql start && \
+	mysql -u root magento < /tmp/magento-sample-data-1.9.0.0/magento_sample_data_for_1.9.0.0.sql
+
+RUN service mysql start && \
+	MYSQL_HOST=127.0.0.1 MYSQL_USER=magento MYSQL_PASSWORD=P4ssw0rd MYSQL_DATABASE=magento MAGENTO_LOCALE=en_US MAGENTO_TIMEZONE=Europe/Paris MAGENTO_DEFAULT_CURRENCY=USD MAGENTO_URL=http://mymagentostore.com MAGENTO_ADMIN_FIRSTNAME=Admin MAGENTO_ADMIN_LASTNAME=MyStore [email protected] MAGENTO_ADMIN_USERNAME=admin MAGENTO_ADMIN_PASSWORD=magentorocks1 /usr/local/bin/install-magento
 
 ## configure Magento
-RUN find /var/lib/mysql -type f -exec touch {} \; && service mysql start && \
+RUN service mysql start && \
 	n98-magerun --skip-root-check --root-dir=/var/www/htdocs cache:flush && \
 	n98-magerun --skip-root-check --root-dir=/var/www/htdocs cache:disable && \
 	n98-magerun --skip-root-check --root-dir=/var/www/htdocs config:set dev/template/allow_symlink "1" >/dev/null 2>&1 && \
 	n98-magerun --skip-root-check --root-dir=/var/www/htdocs admin:notifications >/dev/null 2>&1 && \
-    n98-magerun --skip-root-check --root-dir=/var/www/htdocs config:set admin/security/use_form_key "0" >/dev/null 2>&1 && \
-	service mysql stop
+    n98-magerun --skip-root-check --root-dir=/var/www/htdocs config:set admin/security/use_form_key "0" >/dev/null 2>&1
 
 # algoliasearch-magento setup
 RUN cd /tmp && curl -s -L -O https://raw.github.com/colinmollenhour/modman/master/modman-installer && chmod +x modman-installer && ./modman-installer