Wavyzz/dolibarr-docker-fork
2
0
Fork 0
forked from Wavyzz/dolibarr-docker
Code Pull Requests Actions Activity

More logs. Include demo data.

Browse Source
This commit is contained in:
Laurent Destailleur
2024-08-18 18:10:46 +02:00
parent 3d26e308d2
commit e0786cfc87
14 changed files with 168 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.template
View File

@@ -81,6 +81,8 @@ RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.
rm -rf /tmp/* && \ rm -rf /tmp/* && \
mkdir -p /var/www/documents && \ mkdir -p /var/www/documents && \
mkdir -p /var/www/html/custom && \ mkdir -p /var/www/html/custom && \
mkdir -p /var/www/dev && \
cp -r /tmp/dolibarr-${DOLI_VERSION}/dev/initdemo /var/www/dev && \
chown -R www-data:www-data /var/www chown -R www-data:www-data /var/www
EXPOSE 80 EXPOSE 80

9
docker-run.sh
View File

@@ -197,12 +197,14 @@ function initializeDatabase()
mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "INSERT INTO llx_const(name,value,type,visible,note,entity) VALUES ('SYSTEMTOOLS_MYSQLDUMP', '/usr/bin/mysqldump', 'chaine', 0, '', 0);" > /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} -e "INSERT INTO llx_const(name,value,type,visible,note,entity) VALUES ('SYSTEMTOOLS_MYSQLDUMP', '/usr/bin/mysqldump', 'chaine', 0, '', 0);" > /dev/null 2>&1
if [[ ${DOLI_INIT_DEMO} -eq 1 ]]; then if [[ ${DOLI_INIT_DEMO} -eq 1 ]]; then
echo "Load demo data ..."
for fileSQL in /var/www/dev/initdemo/*.sql; do for fileSQL in /var/www/dev/initdemo/*.sql; do
# We exclude the old load file. # We exclude the old load file.
if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then
continue continue
fi fi
echo "Load demo data ${fileSQL} ..." 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 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
done done
fi fi
@@ -257,7 +259,9 @@ function run()
echo "Current Version is : ${DOLI_VERSION}" echo "Current Version is : ${DOLI_VERSION}"
# If install of mysql database (and not install of cron) is requested # If install of mysql database (and not install of cron) is requested
if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ${DOLI_CRON} -ne 1 && ! -f /var/www/documents/install.lock && ${DOLI_DB_TYPE} != "pgsql" ]]; then if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ${DOLI_CRON} -ne 1 && ${DOLI_DB_TYPE} != "pgsql" ]]; then
echo "DOLI_INSTALL_AUTO is on, so we check to initialize or upgrade mariadb database"
if [[ ! -f /var/www/documents/install.lock ]]; then
waitForDataBase waitForDataBase
mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1 mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
@@ -277,6 +281,9 @@ function run()
if [[ ${DOLI_VERSION} != "develop" ]]; then if [[ ${DOLI_VERSION} != "develop" ]]; then
lockInstallation lockInstallation
fi fi
else
echo "File /var/www/documents/install.lock exists so we cancel database init"
fi
fi fi
# Run scripts before starting # Run scripts before starting

2
images/15.0.3-php7.4/Dockerfile
View File

@@ -81,6 +81,8 @@ RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.
rm -rf /tmp/* && \ rm -rf /tmp/* && \
mkdir -p /var/www/documents && \ mkdir -p /var/www/documents && \
mkdir -p /var/www/html/custom && \ mkdir -p /var/www/html/custom && \
mkdir -p /var/www/dev && \
cp -r /tmp/dolibarr-${DOLI_VERSION}/dev/initdemo /var/www/dev && \
chown -R www-data:www-data /var/www chown -R www-data:www-data /var/www
EXPOSE 80 EXPOSE 80

8
images/15.0.3-php7.4/docker-run.sh
View File

@@ -197,6 +197,7 @@ function initializeDatabase()
mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "INSERT INTO llx_const(name,value,type,visible,note,entity) VALUES ('SYSTEMTOOLS_MYSQLDUMP', '/usr/bin/mysqldump', 'chaine', 0, '', 0);" > /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} -e "INSERT INTO llx_const(name,value,type,visible,note,entity) VALUES ('SYSTEMTOOLS_MYSQLDUMP', '/usr/bin/mysqldump', 'chaine', 0, '', 0);" > /dev/null 2>&1
if [[ ${DOLI_INIT_DEMO} -eq 1 ]]; then if [[ ${DOLI_INIT_DEMO} -eq 1 ]]; then
echo "Load demo data ..."
for fileSQL in /var/www/dev/initdemo/*.sql; do for fileSQL in /var/www/dev/initdemo/*.sql; do
# We exclude the old load file. # We exclude the old load file.
if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then
@@ -258,7 +259,9 @@ function run()
echo "Current Version is : ${DOLI_VERSION}" echo "Current Version is : ${DOLI_VERSION}"
# If install of mysql database (and not install of cron) is requested # If install of mysql database (and not install of cron) is requested
if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ${DOLI_CRON} -ne 1 && ! -f /var/www/documents/install.lock && ${DOLI_DB_TYPE} != "pgsql" ]]; then if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ${DOLI_CRON} -ne 1 && ${DOLI_DB_TYPE} != "pgsql" ]]; then
echo "DOLI_INSTALL_AUTO is on, so we check to initialize or upgrade mariadb database"
if [[ ! -f /var/www/documents/install.lock ]]; then
waitForDataBase waitForDataBase
mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1 mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
@@ -278,6 +281,9 @@ function run()
if [[ ${DOLI_VERSION} != "develop" ]]; then if [[ ${DOLI_VERSION} != "develop" ]]; then
lockInstallation lockInstallation
fi fi
else
echo "File /var/www/documents/install.lock exists so we cancel database init"
fi
fi fi
# Run scripts before starting # Run scripts before starting

2
images/16.0.5-php8.1/Dockerfile
View File

@@ -81,6 +81,8 @@ RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.
rm -rf /tmp/* && \ rm -rf /tmp/* && \
mkdir -p /var/www/documents && \ mkdir -p /var/www/documents && \
mkdir -p /var/www/html/custom && \ mkdir -p /var/www/html/custom && \
mkdir -p /var/www/dev && \
cp -r /tmp/dolibarr-${DOLI_VERSION}/dev/initdemo /var/www/dev && \
chown -R www-data:www-data /var/www chown -R www-data:www-data /var/www
EXPOSE 80 EXPOSE 80

8
images/16.0.5-php8.1/docker-run.sh
View File

@@ -197,6 +197,7 @@ function initializeDatabase()
mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "INSERT INTO llx_const(name,value,type,visible,note,entity) VALUES ('SYSTEMTOOLS_MYSQLDUMP', '/usr/bin/mysqldump', 'chaine', 0, '', 0);" > /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} -e "INSERT INTO llx_const(name,value,type,visible,note,entity) VALUES ('SYSTEMTOOLS_MYSQLDUMP', '/usr/bin/mysqldump', 'chaine', 0, '', 0);" > /dev/null 2>&1
if [[ ${DOLI_INIT_DEMO} -eq 1 ]]; then if [[ ${DOLI_INIT_DEMO} -eq 1 ]]; then
echo "Load demo data ..."
for fileSQL in /var/www/dev/initdemo/*.sql; do for fileSQL in /var/www/dev/initdemo/*.sql; do
# We exclude the old load file. # We exclude the old load file.
if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then
@@ -258,7 +259,9 @@ function run()
echo "Current Version is : ${DOLI_VERSION}" echo "Current Version is : ${DOLI_VERSION}"
# If install of mysql database (and not install of cron) is requested # If install of mysql database (and not install of cron) is requested
if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ${DOLI_CRON} -ne 1 && ! -f /var/www/documents/install.lock && ${DOLI_DB_TYPE} != "pgsql" ]]; then if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ${DOLI_CRON} -ne 1 && ${DOLI_DB_TYPE} != "pgsql" ]]; then
echo "DOLI_INSTALL_AUTO is on, so we check to initialize or upgrade mariadb database"
if [[ ! -f /var/www/documents/install.lock ]]; then
waitForDataBase waitForDataBase
mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1 mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
@@ -278,6 +281,9 @@ function run()
if [[ ${DOLI_VERSION} != "develop" ]]; then if [[ ${DOLI_VERSION} != "develop" ]]; then
lockInstallation lockInstallation
fi fi
else
echo "File /var/www/documents/install.lock exists so we cancel database init"
fi
fi fi
# Run scripts before starting # Run scripts before starting

2
images/17.0.4-php8.1/Dockerfile
View File

@@ -81,6 +81,8 @@ RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.
rm -rf /tmp/* && \ rm -rf /tmp/* && \
mkdir -p /var/www/documents && \ mkdir -p /var/www/documents && \
mkdir -p /var/www/html/custom && \ mkdir -p /var/www/html/custom && \
mkdir -p /var/www/dev && \
cp -r /tmp/dolibarr-${DOLI_VERSION}/dev/initdemo /var/www/dev && \
chown -R www-data:www-data /var/www chown -R www-data:www-data /var/www
EXPOSE 80 EXPOSE 80

8
images/17.0.4-php8.1/docker-run.sh
View File

@@ -197,6 +197,7 @@ function initializeDatabase()
mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "INSERT INTO llx_const(name,value,type,visible,note,entity) VALUES ('SYSTEMTOOLS_MYSQLDUMP', '/usr/bin/mysqldump', 'chaine', 0, '', 0);" > /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} -e "INSERT INTO llx_const(name,value,type,visible,note,entity) VALUES ('SYSTEMTOOLS_MYSQLDUMP', '/usr/bin/mysqldump', 'chaine', 0, '', 0);" > /dev/null 2>&1
if [[ ${DOLI_INIT_DEMO} -eq 1 ]]; then if [[ ${DOLI_INIT_DEMO} -eq 1 ]]; then
echo "Load demo data ..."
for fileSQL in /var/www/dev/initdemo/*.sql; do for fileSQL in /var/www/dev/initdemo/*.sql; do
# We exclude the old load file. # We exclude the old load file.
if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then
@@ -258,7 +259,9 @@ function run()
echo "Current Version is : ${DOLI_VERSION}" echo "Current Version is : ${DOLI_VERSION}"
# If install of mysql database (and not install of cron) is requested # If install of mysql database (and not install of cron) is requested
if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ${DOLI_CRON} -ne 1 && ! -f /var/www/documents/install.lock && ${DOLI_DB_TYPE} != "pgsql" ]]; then if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ${DOLI_CRON} -ne 1 && ${DOLI_DB_TYPE} != "pgsql" ]]; then
echo "DOLI_INSTALL_AUTO is on, so we check to initialize or upgrade mariadb database"
if [[ ! -f /var/www/documents/install.lock ]]; then
waitForDataBase waitForDataBase
mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1 mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
@@ -278,6 +281,9 @@ function run()
if [[ ${DOLI_VERSION} != "develop" ]]; then if [[ ${DOLI_VERSION} != "develop" ]]; then
lockInstallation lockInstallation
fi fi
else
echo "File /var/www/documents/install.lock exists so we cancel database init"
fi
fi fi
# Run scripts before starting # Run scripts before starting

2
images/18.0.5-php8.1/Dockerfile
View File

@@ -81,6 +81,8 @@ RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.
rm -rf /tmp/* && \ rm -rf /tmp/* && \
mkdir -p /var/www/documents && \ mkdir -p /var/www/documents && \
mkdir -p /var/www/html/custom && \ mkdir -p /var/www/html/custom && \
mkdir -p /var/www/dev && \
cp -r /tmp/dolibarr-${DOLI_VERSION}/dev/initdemo /var/www/dev && \
chown -R www-data:www-data /var/www chown -R www-data:www-data /var/www
EXPOSE 80 EXPOSE 80

8
images/18.0.5-php8.1/docker-run.sh
View File

@@ -197,6 +197,7 @@ function initializeDatabase()
mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "INSERT INTO llx_const(name,value,type,visible,note,entity) VALUES ('SYSTEMTOOLS_MYSQLDUMP', '/usr/bin/mysqldump', 'chaine', 0, '', 0);" > /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} -e "INSERT INTO llx_const(name,value,type,visible,note,entity) VALUES ('SYSTEMTOOLS_MYSQLDUMP', '/usr/bin/mysqldump', 'chaine', 0, '', 0);" > /dev/null 2>&1
if [[ ${DOLI_INIT_DEMO} -eq 1 ]]; then if [[ ${DOLI_INIT_DEMO} -eq 1 ]]; then
echo "Load demo data ..."
for fileSQL in /var/www/dev/initdemo/*.sql; do for fileSQL in /var/www/dev/initdemo/*.sql; do
# We exclude the old load file. # We exclude the old load file.
if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then
@@ -258,7 +259,9 @@ function run()
echo "Current Version is : ${DOLI_VERSION}" echo "Current Version is : ${DOLI_VERSION}"
# If install of mysql database (and not install of cron) is requested # If install of mysql database (and not install of cron) is requested
if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ${DOLI_CRON} -ne 1 && ! -f /var/www/documents/install.lock && ${DOLI_DB_TYPE} != "pgsql" ]]; then if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ${DOLI_CRON} -ne 1 && ${DOLI_DB_TYPE} != "pgsql" ]]; then
echo "DOLI_INSTALL_AUTO is on, so we check to initialize or upgrade mariadb database"
if [[ ! -f /var/www/documents/install.lock ]]; then
waitForDataBase waitForDataBase
mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1 mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
@@ -278,6 +281,9 @@ function run()
if [[ ${DOLI_VERSION} != "develop" ]]; then if [[ ${DOLI_VERSION} != "develop" ]]; then
lockInstallation lockInstallation
fi fi
else
echo "File /var/www/documents/install.lock exists so we cancel database init"
fi
fi fi
# Run scripts before starting # Run scripts before starting

2
images/19.0.2-php8.2/Dockerfile
View File

@@ -81,6 +81,8 @@ RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.
rm -rf /tmp/* && \ rm -rf /tmp/* && \
mkdir -p /var/www/documents && \ mkdir -p /var/www/documents && \
mkdir -p /var/www/html/custom && \ mkdir -p /var/www/html/custom && \
mkdir -p /var/www/dev && \
cp -r /tmp/dolibarr-${DOLI_VERSION}/dev/initdemo /var/www/dev && \
chown -R www-data:www-data /var/www chown -R www-data:www-data /var/www
EXPOSE 80 EXPOSE 80

8
images/19.0.2-php8.2/docker-run.sh
View File

@@ -197,6 +197,7 @@ function initializeDatabase()
mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "INSERT INTO llx_const(name,value,type,visible,note,entity) VALUES ('SYSTEMTOOLS_MYSQLDUMP', '/usr/bin/mysqldump', 'chaine', 0, '', 0);" > /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} -e "INSERT INTO llx_const(name,value,type,visible,note,entity) VALUES ('SYSTEMTOOLS_MYSQLDUMP', '/usr/bin/mysqldump', 'chaine', 0, '', 0);" > /dev/null 2>&1
if [[ ${DOLI_INIT_DEMO} -eq 1 ]]; then if [[ ${DOLI_INIT_DEMO} -eq 1 ]]; then
echo "Load demo data ..."
for fileSQL in /var/www/dev/initdemo/*.sql; do for fileSQL in /var/www/dev/initdemo/*.sql; do
# We exclude the old load file. # We exclude the old load file.
if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then
@@ -258,7 +259,9 @@ function run()
echo "Current Version is : ${DOLI_VERSION}" echo "Current Version is : ${DOLI_VERSION}"
# If install of mysql database (and not install of cron) is requested # If install of mysql database (and not install of cron) is requested
if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ${DOLI_CRON} -ne 1 && ! -f /var/www/documents/install.lock && ${DOLI_DB_TYPE} != "pgsql" ]]; then if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ${DOLI_CRON} -ne 1 && ${DOLI_DB_TYPE} != "pgsql" ]]; then
echo "DOLI_INSTALL_AUTO is on, so we check to initialize or upgrade mariadb database"
if [[ ! -f /var/www/documents/install.lock ]]; then
waitForDataBase waitForDataBase
mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1 mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
@@ -278,6 +281,9 @@ function run()
if [[ ${DOLI_VERSION} != "develop" ]]; then if [[ ${DOLI_VERSION} != "develop" ]]; then
lockInstallation lockInstallation
fi fi
else
echo "File /var/www/documents/install.lock exists so we cancel database init"
fi
fi fi
# Run scripts before starting # Run scripts before starting

2
images/develop/Dockerfile
View File

@@ -81,6 +81,8 @@ RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.
rm -rf /tmp/* && \ rm -rf /tmp/* && \
mkdir -p /var/www/documents && \ mkdir -p /var/www/documents && \
mkdir -p /var/www/html/custom && \ mkdir -p /var/www/html/custom && \
mkdir -p /var/www/dev && \
cp -r /tmp/dolibarr-${DOLI_VERSION}/dev/initdemo /var/www/dev && \
chown -R www-data:www-data /var/www chown -R www-data:www-data /var/www
EXPOSE 80 EXPOSE 80

8
images/develop/docker-run.sh
View File

@@ -197,6 +197,7 @@ function initializeDatabase()
mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "INSERT INTO llx_const(name,value,type,visible,note,entity) VALUES ('SYSTEMTOOLS_MYSQLDUMP', '/usr/bin/mysqldump', 'chaine', 0, '', 0);" > /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} -e "INSERT INTO llx_const(name,value,type,visible,note,entity) VALUES ('SYSTEMTOOLS_MYSQLDUMP', '/usr/bin/mysqldump', 'chaine', 0, '', 0);" > /dev/null 2>&1
if [[ ${DOLI_INIT_DEMO} -eq 1 ]]; then if [[ ${DOLI_INIT_DEMO} -eq 1 ]]; then
echo "Load demo data ..."
for fileSQL in /var/www/dev/initdemo/*.sql; do for fileSQL in /var/www/dev/initdemo/*.sql; do
# We exclude the old load file. # We exclude the old load file.
if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then
@@ -258,7 +259,9 @@ function run()
echo "Current Version is : ${DOLI_VERSION}" echo "Current Version is : ${DOLI_VERSION}"
# If install of mysql database (and not install of cron) is requested # If install of mysql database (and not install of cron) is requested
if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ${DOLI_CRON} -ne 1 && ! -f /var/www/documents/install.lock && ${DOLI_DB_TYPE} != "pgsql" ]]; then if [[ ${DOLI_INSTALL_AUTO} -eq 1 && ${DOLI_CRON} -ne 1 && ${DOLI_DB_TYPE} != "pgsql" ]]; then
echo "DOLI_INSTALL_AUTO is on, so we check to initialize or upgrade mariadb database"
if [[ ! -f /var/www/documents/install.lock ]]; then
waitForDataBase waitForDataBase
mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1 mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "SELECT Q.LAST_INSTALLED_VERSION FROM (SELECT INET_ATON(CONCAT(value, REPEAT('.0', 3 - CHAR_LENGTH(value) + CHAR_LENGTH(REPLACE(value, '.', ''))))) as VERSION_ATON, value as LAST_INSTALLED_VERSION FROM llx_const WHERE name IN ('MAIN_VERSION_LAST_INSTALL', 'MAIN_VERSION_LAST_UPGRADE') and entity=0) Q ORDER BY VERSION_ATON DESC LIMIT 1" > /tmp/lastinstall.result 2>&1
@@ -278,6 +281,9 @@ function run()
if [[ ${DOLI_VERSION} != "develop" ]]; then if [[ ${DOLI_VERSION} != "develop" ]]; then
lockInstallation lockInstallation
fi fi
else
echo "File /var/www/documents/install.lock exists so we cancel database init"
fi
fi fi
# Run scripts before starting # Run scripts before starting