Skip to content

Commit e4a9c54

Browse files
author
Jan Petr
authored
Merge pull request #941 from algolia/fix_docker
Fix dev Docker container
2 parents 76ce36b + 8e22d2b commit e4a9c54

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

dev/Dockerfile.base

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ RUN cd /var/www/htdocs/skin && cp -R /tmp/magento-sample-data-1.9.0.0/skin/* .
3131
RUN chown -R www-data:www-data /var/www/htdocs
3232

3333
## database setup
34-
RUN service mysql start && \
34+
RUN find /var/lib/mysql -type f -exec touch {} \; && service mysql start && \
3535
(echo "CREATE DATABASE magento" | mysql -u root --password=P4ssw0rd) && \
3636
mysql -u root --password=P4ssw0rd magento < /tmp/magento-sample-data-1.9.0.0/magento_sample_data_for_1.9.0.0.sql && \
3737
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 && \
3838
service mysql stop
3939

4040
## configure Magento
41-
RUN service mysql start && \
41+
RUN find /var/lib/mysql -type f -exec touch {} \; && service mysql start && \
4242
n98-magerun --skip-root-check --root-dir=/var/www/htdocs cache:flush && \
4343
n98-magerun --skip-root-check --root-dir=/var/www/htdocs cache:disable && \
4444
n98-magerun --skip-root-check --root-dir=/var/www/htdocs config:set dev/template/allow_symlink "1" >/dev/null 2>&1 && \

dev/bin/start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /usr/bin/env bash
22

33
# start services
4-
service mysql start
4+
find /var/lib/mysql -type f -exec touch {} \; && service mysql start
55
service apache2 start
66

77
# GET / to initialize the algolia_search_indexer (Open to another cleaner way to do it :) )

0 commit comments

Comments
 (0)