From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Thu, 30 Jun 2016 20:24:49 +0000 (+0200)
Subject: Fix engine substitution in phpBB3 importer template
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9a3e1b6c0ea1ae2d35dc65a5dc0b9c0113540e55;p=discourse_docker.git

Fix engine substitution in phpBB3 importer template
---

diff --git a/templates/import/phpbb3.template.yml b/templates/import/phpbb3.template.yml
index fafde35..29b81bd 100644
--- a/templates/import/phpbb3.template.yml
+++ b/templates/import/phpbb3.template.yml
@@ -33,6 +33,7 @@ hooks:
           default-storage-engine=MyISAM
           default-tmp-storage-engine=MyISAM
           innodb=OFF
+          sql_mode=NO_AUTO_CREATE_USER
 
           datadir=/shared/import/mysql/data
 
@@ -81,7 +82,7 @@ hooks:
               echo "Loading database dump into MySQL..."
               mysql -uroot -e "DROP DATABASE IF EXISTS phpbb"
               mysql -uroot -e "CREATE DATABASE phpbb"
-              mysql -uroot --default-character-set=utf8 --database=phpbb < /shared/import/data/phpbb_mysql.sql
+              mysql -uroot --default-character-set=utf8 --database=phpbb < /shared/import/data/phpbb_mysql.sql && \
               touch /shared/import/mysql/imported
             fi
           else