From 3701ef9da28fcfa977d229b15be34fbc4b2da4cf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 6 Sep 2024 23:19:38 +0200 Subject: [PATCH] Enhance load of dump file --- docker-run.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker-run.sh b/docker-run.sh index 7da4b32..37c1a28 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -199,10 +199,13 @@ function initializeDatabase() if [[ ${DOLI_INIT_DEMO} -eq 1 ]]; then mkdir -p /var/www/dev/initdemo/ versiondemo=`echo "${DOLI_VERSION}" | sed "s/^\([0-9]*\.[0-9]*\).*/\1.0/"` - echo "Load demo data from file https://raw.githubusercontent.com/Dolibarr/dolibarr/${DOLI_VERSION}/dev/initdemo/mysqldump_dolibarr_$versiondemo.sql ..." + echo "Get demo data from file https://raw.githubusercontent.com/Dolibarr/dolibarr/${DOLI_VERSION}/dev/initdemo/mysqldump_dolibarr_$versiondemo.sql ..." curl -fLSs -o /var/www/dev/initdemo/initdemo.sql https://raw.githubusercontent.com/Dolibarr/dolibarr/${DOLI_VERSION}/dev/initdemo/mysqldump_dolibarr_$versiondemo.sql for fileSQL in /var/www/dev/initdemo/*.sql; do - echo "Load demo data ${fileSQL} ..." + echo "Found demo data file, so we first drop table llx_accounting_system ..." + echo "mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e \"DROP TABLE llx_accounting_system\" > /var/www/documents/initdemo.log 2>&1" + mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "DROP TABLE llx_accounting_system" > /var/www/documents/initdemo.log 2>&1 + echo "Then we load demo data ${fileSQL} ..." sed -i 's/--.*//g;' ${fileSQL} echo "mysql -u ${DOLI_DB_USER} -pxxxxxxx -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL} > /var/www/documents/initdemo.log 2>&1" mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL} > /var/www/documents/initdemo.log 2>&1