Fix get of data file

Dolibarr · Sep 4, 2024 · 8b9a1aa · 8b9a1aa
1 parent 67bcd10
commit 8b9a1aa
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 36 deletions.
diff --git a/docker-run.sh b/docker-run.sh
@@ -205,7 +205,7 @@ function initializeDatabase()
   		echo "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}"
-    	mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL} > /dev/null 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/dev/initdemo/initdemo.log 2>&1
     done
   fi
 

diff --git a/images/15.0.3-php7.4/docker-run.sh b/images/15.0.3-php7.4/docker-run.sh
@@ -199,16 +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_INIT_DEMO}/dev/initdemo/mysqldump_dolibarr_$versiondemo.sql ..."
+    echo "Load 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
-    	# We exclude the old load file.
-        if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then
-        	continue
-        fi
   		echo "Load demo data ${fileSQL} ..."
         sed -i 's/--.*//g;' ${fileSQL}
-    	mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL} > /dev/null 2>&1
+        echo "mysql -u ${DOLI_DB_USER} -pxxxxxxx -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL}"
+    	mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL} > /var/www/dev/initdemo/initdemo.log 2>&1
     done
   fi
 

diff --git a/images/16.0.5-php8.1/docker-run.sh b/images/16.0.5-php8.1/docker-run.sh
@@ -199,16 +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_INIT_DEMO}/dev/initdemo/mysqldump_dolibarr_$versiondemo.sql ..."
+    echo "Load 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
-    	# We exclude the old load file.
-        if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then
-        	continue
-        fi
   		echo "Load demo data ${fileSQL} ..."
         sed -i 's/--.*//g;' ${fileSQL}
-    	mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL} > /dev/null 2>&1
+        echo "mysql -u ${DOLI_DB_USER} -pxxxxxxx -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL}"
+    	mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL} > /var/www/dev/initdemo/initdemo.log 2>&1
     done
   fi
 

diff --git a/images/17.0.4-php8.1/docker-run.sh b/images/17.0.4-php8.1/docker-run.sh
@@ -199,16 +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_INIT_DEMO}/dev/initdemo/mysqldump_dolibarr_$versiondemo.sql ..."
+    echo "Load 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
-    	# We exclude the old load file.
-        if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then
-        	continue
-        fi
   		echo "Load demo data ${fileSQL} ..."
         sed -i 's/--.*//g;' ${fileSQL}
-    	mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL} > /dev/null 2>&1
+        echo "mysql -u ${DOLI_DB_USER} -pxxxxxxx -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL}"
+    	mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL} > /var/www/dev/initdemo/initdemo.log 2>&1
     done
   fi
 

diff --git a/images/18.0.5-php8.1/docker-run.sh b/images/18.0.5-php8.1/docker-run.sh
@@ -199,16 +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_INIT_DEMO}/dev/initdemo/mysqldump_dolibarr_$versiondemo.sql ..."
+    echo "Load 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
-    	# We exclude the old load file.
-        if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then
-        	continue
-        fi
   		echo "Load demo data ${fileSQL} ..."
         sed -i 's/--.*//g;' ${fileSQL}
-    	mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL} > /dev/null 2>&1
+        echo "mysql -u ${DOLI_DB_USER} -pxxxxxxx -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL}"
+    	mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL} > /var/www/dev/initdemo/initdemo.log 2>&1
     done
   fi
 

diff --git a/images/19.0.3-php8.2/docker-run.sh b/images/19.0.3-php8.2/docker-run.sh
@@ -199,16 +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_INIT_DEMO}/dev/initdemo/mysqldump_dolibarr_$versiondemo.sql ..."
+    echo "Load 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
-    	# We exclude the old load file.
-        if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then
-        	continue
-        fi
   		echo "Load demo data ${fileSQL} ..."
         sed -i 's/--.*//g;' ${fileSQL}
-    	mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL} > /dev/null 2>&1
+        echo "mysql -u ${DOLI_DB_USER} -pxxxxxxx -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL}"
+    	mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL} > /var/www/dev/initdemo/initdemo.log 2>&1
     done
   fi
 

diff --git a/images/README.md b/images/README.md
@@ -0,0 +1 @@
+All files in this directory and subdirectories are generated with the script update.sh using
diff --git a/images/develop/docker-run.sh b/images/develop/docker-run.sh
@@ -199,15 +199,12 @@ 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_INIT_DEMO}/dev/initdemo/mysqldump_dolibarr_$versiondemo.sql ..."
+    echo "Load 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
-    	# We exclude the old load file.
-        if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then
-        	continue
-        fi
   		echo "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}"
     	mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} < ${fileSQL} > /var/www/dev/initdemo/initdemo.log 2>&1
     done
   fi

diff --git a/update.sh b/update.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+#
+# Run this script to generate all files found into images directory, used for each image.
+# The source files are the files into the root.
+# 
 
 set -e
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		All files in this directory and subdirectories are generated with the script update.sh using