diff --git a/README.md b/README.md index 2161757..a87dba6 100644 --- a/README.md +++ b/README.md @@ -92,36 +92,38 @@ When setup this way, to upgrade version the use of the web interface is mandator ## Environment variables summary -| Variable | Default value | Description | -| ----------------------------- | ------------------------------ | ----------- | -| **DOLI_INSTALL_AUTO** | *1* | 1: The installation will be executed on first boot -| **DOLI_DB_TYPE** | *mysqli* | Type of the DB server (**mysqli**, pgsql) -| **DOLI_DB_HOST** | *mysql* | Host name of the MariaDB/MySQL server -| **DOLI_DB_HOST_PORT** | *3306* | Host port of the MariaDB/MySQL server -| **DOLI_DB_USER** | *doli* | Database user -| **DOLI_DB_PASSWORD** | *doli_pass* | Database user's password -| **DOLI_DB_NAME** | *dolidb* | Database name -| **DOLI_ADMIN_LOGIN** | *admin* | Admin's login create on the first boot -| **DOLI_ADMIN_PASSWORD** | *admin* | Admin'password -| **DOLI_URL_ROOT** | *http://localhost* | Url root of the Dolibarr installation -| **PHP_INI_DATE_TIMEZONE** | *UTC* | Default timezone on PHP -| **PHP_INI_MEMORY_LIMIT** | *256M* | PHP Memory limit -| **WWW_USER_ID** | | ID of user www-data. ID will not changed if leave empty. During a development, it is very practical to put the same ID as the host user. -| **WWW_GROUP_ID** | | ID of group www-data. ID will not changed if leave empty. -| **DOLI_AUTH** | *dolibarr* | Which method is used to connect users, change to `ldap` or `ldap, dolibarr` to use LDAP -| **DOLI_LDAP_HOST** | *127.0.0.1* | The host of the LDAP server -| **DOLI_LDAP_PORT** | *389* | The port of the LDAP server -| **DOLI_LDAP_VERSION** | *3* | The version of LDAP to use -| **DOLI_LDAP_SERVER_TYPE** | *openldap* | The type of LDAP server (openLDAP, Active Directory, eGroupWare) -| **DOLI_LDAP_LOGIN_ATTRIBUTE** | *uid* | The attribute used to bind users -| **DOLI_LDAP_DN** | *ou=users,dc=my-domain,dc=com* | The base where to look for users -| **DOLI_LDAP_FILTER** | | The filter to authorise users to connect -| **DOLI_LDAP_BIND_DN** | | The complete DN of the user with read access on users -| **DOLI_LDAP_BIND_PASS** | | The password of the bind user -| **DOLI_LDAP_DEBUG** | *false* | Activate debug mode -| **DOLI_CRON** | *0* | 1: Enable cron service -| **DOLI_CRON_KEY** | | Security key launch cron jobs -| **DOLI_CRON_USER** | | Dolibarr user used for cron jobs +| Variable | Default value | Description | +| ------------------------------- | ------------------------------ | ----------- | +| **DOLI_INSTALL_AUTO** | *1* | 1: The installation will be executed on first boot +| **DOLI_DB_TYPE** | *mysqli* | Type of the DB server (**mysqli**, pgsql) +| **DOLI_DB_HOST** | *mysql* | Host name of the MariaDB/MySQL server +| **DOLI_DB_HOST_PORT** | *3306* | Host port of the MariaDB/MySQL server +| **DOLI_DB_USER** | *doli* | Database user +| **DOLI_DB_PASSWORD** | *doli_pass* | Database user's password +| **DOLI_DB_NAME** | *dolidb* | Database name +| **DOLI_ADMIN_LOGIN** | *admin* | Admin's login create on the first boot +| **DOLI_ADMIN_PASSWORD** | *admin* | Admin'password +| **DOLI_URL_ROOT** | *http://localhost* | Url root of the Dolibarr installation +| **PHP_INI_DATE_TIMEZONE** | *UTC* | Default timezone on PHP +| **PHP_INI_MEMORY_LIMIT** | *256M* | PHP Memory limit +| **PHP_INI_UPLOAD_MAX_FILESIZE** | *2M* | PHP Maximum allowed size for uploaded files +| **PHP_INI_POST_MAX_SIZE** | *8M* | PHP Maximum size of POST data that PHP will accept. +| **WWW_USER_ID** | | ID of user www-data. ID will not changed if leave empty. During a development, it is very practical to put the same ID as the host user. +| **WWW_GROUP_ID** | | ID of group www-data. ID will not changed if leave empty. +| **DOLI_AUTH** | *dolibarr* | Which method is used to connect users, change to `ldap` or `ldap, dolibarr` to use LDAP +| **DOLI_LDAP_HOST** | *127.0.0.1* | The host of the LDAP server +| **DOLI_LDAP_PORT** | *389* | The port of the LDAP server +| **DOLI_LDAP_VERSION** | *3* | The version of LDAP to use +| **DOLI_LDAP_SERVER_TYPE** | *openldap* | The type of LDAP server (openLDAP, Active Directory, eGroupWare) +| **DOLI_LDAP_LOGIN_ATTRIBUTE** | *uid* | The attribute used to bind users +| **DOLI_LDAP_DN** | *ou=users,dc=my-domain,dc=com* | The base where to look for users +| **DOLI_LDAP_FILTER** | | The filter to authorise users to connect +| **DOLI_LDAP_BIND_DN** | | The complete DN of the user with read access on users +| **DOLI_LDAP_BIND_PASS** | | The password of the bind user +| **DOLI_LDAP_DEBUG** | *false* | Activate debug mode +| **DOLI_CRON** | *0* | 1: Enable cron service +| **DOLI_CRON_KEY** | | Security key launch cron jobs +| **DOLI_CRON_USER** | | Dolibarr user used for cron jobs Some environment variables are compatible with docker secrets behaviour, just add the `_FILE` suffix to var name and point the value file to read. Environment variables that are compatible with docker secrets: diff --git a/images/11.0.5-php7.4/Dockerfile b/images/11.0.5-php7.4/Dockerfile index cefe395..41fe8fc 100644 --- a/images/11.0.5-php7.4/Dockerfile +++ b/images/11.0.5-php7.4/Dockerfile @@ -34,6 +34,8 @@ ENV WWW_GROUP_ID 33 ENV PHP_INI_DATE_TIMEZONE 'UTC' ENV PHP_INI_MEMORY_LIMIT 256M +ENV PHP_INI_UPLOAD_MAX_FILESIZE 2M +ENV PHP_INI_POST_MAX_SIZE 8M RUN apt-get update -y \ && apt-get dist-upgrade -y \ diff --git a/images/11.0.5-php7.4/docker-run.sh b/images/11.0.5-php7.4/docker-run.sh index 7546aaa..427bb06 100755 --- a/images/11.0.5-php7.4/docker-run.sh +++ b/images/11.0.5-php7.4/docker-run.sh @@ -42,6 +42,8 @@ function initDolibarr() date.timezone = ${PHP_INI_DATE_TIMEZONE} sendmail_path = /usr/sbin/sendmail -t -i memory_limit = ${PHP_INI_MEMORY_LIMIT} +upload_max_filesize = ${PHP_INI_UPLOAD_MAX_FILESIZE} +post_max_size = ${PHP_INI_POST_MAX_SIZE} EOF if [[ ! -f /var/www/html/conf/conf.php ]]; then diff --git a/images/12.0.5-php7.4/Dockerfile b/images/12.0.5-php7.4/Dockerfile index 7abb300..d26e319 100644 --- a/images/12.0.5-php7.4/Dockerfile +++ b/images/12.0.5-php7.4/Dockerfile @@ -34,6 +34,8 @@ ENV WWW_GROUP_ID 33 ENV PHP_INI_DATE_TIMEZONE 'UTC' ENV PHP_INI_MEMORY_LIMIT 256M +ENV PHP_INI_UPLOAD_MAX_FILESIZE 2M +ENV PHP_INI_POST_MAX_SIZE 8M RUN apt-get update -y \ && apt-get dist-upgrade -y \ diff --git a/images/12.0.5-php7.4/docker-run.sh b/images/12.0.5-php7.4/docker-run.sh index 7546aaa..427bb06 100755 --- a/images/12.0.5-php7.4/docker-run.sh +++ b/images/12.0.5-php7.4/docker-run.sh @@ -42,6 +42,8 @@ function initDolibarr() date.timezone = ${PHP_INI_DATE_TIMEZONE} sendmail_path = /usr/sbin/sendmail -t -i memory_limit = ${PHP_INI_MEMORY_LIMIT} +upload_max_filesize = ${PHP_INI_UPLOAD_MAX_FILESIZE} +post_max_size = ${PHP_INI_POST_MAX_SIZE} EOF if [[ ! -f /var/www/html/conf/conf.php ]]; then diff --git a/images/13.0.4-php7.4/Dockerfile b/images/13.0.4-php7.4/Dockerfile index 98a87c2..05de5db 100644 --- a/images/13.0.4-php7.4/Dockerfile +++ b/images/13.0.4-php7.4/Dockerfile @@ -34,6 +34,8 @@ ENV WWW_GROUP_ID 33 ENV PHP_INI_DATE_TIMEZONE 'UTC' ENV PHP_INI_MEMORY_LIMIT 256M +ENV PHP_INI_UPLOAD_MAX_FILESIZE 2M +ENV PHP_INI_POST_MAX_SIZE 8M RUN apt-get update -y \ && apt-get dist-upgrade -y \ diff --git a/images/13.0.4-php7.4/docker-run.sh b/images/13.0.4-php7.4/docker-run.sh index 7546aaa..427bb06 100755 --- a/images/13.0.4-php7.4/docker-run.sh +++ b/images/13.0.4-php7.4/docker-run.sh @@ -42,6 +42,8 @@ function initDolibarr() date.timezone = ${PHP_INI_DATE_TIMEZONE} sendmail_path = /usr/sbin/sendmail -t -i memory_limit = ${PHP_INI_MEMORY_LIMIT} +upload_max_filesize = ${PHP_INI_UPLOAD_MAX_FILESIZE} +post_max_size = ${PHP_INI_POST_MAX_SIZE} EOF if [[ ! -f /var/www/html/conf/conf.php ]]; then diff --git a/images/14.0.5-php7.4/Dockerfile b/images/14.0.5-php7.4/Dockerfile index 83ca823..d5a1b84 100644 --- a/images/14.0.5-php7.4/Dockerfile +++ b/images/14.0.5-php7.4/Dockerfile @@ -34,6 +34,8 @@ ENV WWW_GROUP_ID 33 ENV PHP_INI_DATE_TIMEZONE 'UTC' ENV PHP_INI_MEMORY_LIMIT 256M +ENV PHP_INI_UPLOAD_MAX_FILESIZE 2M +ENV PHP_INI_POST_MAX_SIZE 8M RUN apt-get update -y \ && apt-get dist-upgrade -y \ diff --git a/images/14.0.5-php7.4/docker-run.sh b/images/14.0.5-php7.4/docker-run.sh index 7546aaa..427bb06 100755 --- a/images/14.0.5-php7.4/docker-run.sh +++ b/images/14.0.5-php7.4/docker-run.sh @@ -42,6 +42,8 @@ function initDolibarr() date.timezone = ${PHP_INI_DATE_TIMEZONE} sendmail_path = /usr/sbin/sendmail -t -i memory_limit = ${PHP_INI_MEMORY_LIMIT} +upload_max_filesize = ${PHP_INI_UPLOAD_MAX_FILESIZE} +post_max_size = ${PHP_INI_POST_MAX_SIZE} EOF if [[ ! -f /var/www/html/conf/conf.php ]]; then diff --git a/images/15.0.3-php7.4/Dockerfile b/images/15.0.3-php7.4/Dockerfile index 8fea033..381be05 100644 --- a/images/15.0.3-php7.4/Dockerfile +++ b/images/15.0.3-php7.4/Dockerfile @@ -34,6 +34,8 @@ ENV WWW_GROUP_ID 33 ENV PHP_INI_DATE_TIMEZONE 'UTC' ENV PHP_INI_MEMORY_LIMIT 256M +ENV PHP_INI_UPLOAD_MAX_FILESIZE 2M +ENV PHP_INI_POST_MAX_SIZE 8M RUN apt-get update -y \ && apt-get dist-upgrade -y \ diff --git a/images/15.0.3-php7.4/docker-run.sh b/images/15.0.3-php7.4/docker-run.sh index 7546aaa..427bb06 100755 --- a/images/15.0.3-php7.4/docker-run.sh +++ b/images/15.0.3-php7.4/docker-run.sh @@ -42,6 +42,8 @@ function initDolibarr() date.timezone = ${PHP_INI_DATE_TIMEZONE} sendmail_path = /usr/sbin/sendmail -t -i memory_limit = ${PHP_INI_MEMORY_LIMIT} +upload_max_filesize = ${PHP_INI_UPLOAD_MAX_FILESIZE} +post_max_size = ${PHP_INI_POST_MAX_SIZE} EOF if [[ ! -f /var/www/html/conf/conf.php ]]; then diff --git a/images/16.0.4-php8.1/Dockerfile b/images/16.0.4-php8.1/Dockerfile index 652759a..b165ede 100644 --- a/images/16.0.4-php8.1/Dockerfile +++ b/images/16.0.4-php8.1/Dockerfile @@ -34,6 +34,8 @@ ENV WWW_GROUP_ID 33 ENV PHP_INI_DATE_TIMEZONE 'UTC' ENV PHP_INI_MEMORY_LIMIT 256M +ENV PHP_INI_UPLOAD_MAX_FILESIZE 2M +ENV PHP_INI_POST_MAX_SIZE 8M RUN apt-get update -y \ && apt-get dist-upgrade -y \ diff --git a/images/16.0.4-php8.1/docker-run.sh b/images/16.0.4-php8.1/docker-run.sh index 7546aaa..427bb06 100755 --- a/images/16.0.4-php8.1/docker-run.sh +++ b/images/16.0.4-php8.1/docker-run.sh @@ -42,6 +42,8 @@ function initDolibarr() date.timezone = ${PHP_INI_DATE_TIMEZONE} sendmail_path = /usr/sbin/sendmail -t -i memory_limit = ${PHP_INI_MEMORY_LIMIT} +upload_max_filesize = ${PHP_INI_UPLOAD_MAX_FILESIZE} +post_max_size = ${PHP_INI_POST_MAX_SIZE} EOF if [[ ! -f /var/www/html/conf/conf.php ]]; then diff --git a/images/17.0.0-php8.1/Dockerfile b/images/17.0.0-php8.1/Dockerfile index 3b6b41b..1168f10 100644 --- a/images/17.0.0-php8.1/Dockerfile +++ b/images/17.0.0-php8.1/Dockerfile @@ -34,6 +34,8 @@ ENV WWW_GROUP_ID 33 ENV PHP_INI_DATE_TIMEZONE 'UTC' ENV PHP_INI_MEMORY_LIMIT 256M +ENV PHP_INI_UPLOAD_MAX_FILESIZE 2M +ENV PHP_INI_POST_MAX_SIZE 8M RUN apt-get update -y \ && apt-get dist-upgrade -y \ diff --git a/images/17.0.0-php8.1/docker-run.sh b/images/17.0.0-php8.1/docker-run.sh index 7546aaa..427bb06 100755 --- a/images/17.0.0-php8.1/docker-run.sh +++ b/images/17.0.0-php8.1/docker-run.sh @@ -42,6 +42,8 @@ function initDolibarr() date.timezone = ${PHP_INI_DATE_TIMEZONE} sendmail_path = /usr/sbin/sendmail -t -i memory_limit = ${PHP_INI_MEMORY_LIMIT} +upload_max_filesize = ${PHP_INI_UPLOAD_MAX_FILESIZE} +post_max_size = ${PHP_INI_POST_MAX_SIZE} EOF if [[ ! -f /var/www/html/conf/conf.php ]]; then diff --git a/images/develop/Dockerfile b/images/develop/Dockerfile index cd7f3e3..de91e91 100644 --- a/images/develop/Dockerfile +++ b/images/develop/Dockerfile @@ -34,6 +34,8 @@ ENV WWW_GROUP_ID 33 ENV PHP_INI_DATE_TIMEZONE 'UTC' ENV PHP_INI_MEMORY_LIMIT 256M +ENV PHP_INI_UPLOAD_MAX_FILESIZE 2M +ENV PHP_INI_POST_MAX_SIZE 8M RUN apt-get update -y \ && apt-get dist-upgrade -y \ diff --git a/images/develop/docker-run.sh b/images/develop/docker-run.sh index 7546aaa..427bb06 100755 --- a/images/develop/docker-run.sh +++ b/images/develop/docker-run.sh @@ -42,6 +42,8 @@ function initDolibarr() date.timezone = ${PHP_INI_DATE_TIMEZONE} sendmail_path = /usr/sbin/sendmail -t -i memory_limit = ${PHP_INI_MEMORY_LIMIT} +upload_max_filesize = ${PHP_INI_UPLOAD_MAX_FILESIZE} +post_max_size = ${PHP_INI_POST_MAX_SIZE} EOF if [[ ! -f /var/www/html/conf/conf.php ]]; then