diff --git a/README.md b/README.md index 5601442..592f098 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,7 @@ services: DOLI_ADMIN_LOGIN: "${DOLI_ADMIN_LOGIN:-admin}" DOLI_ADMIN_PASSWORD: "${DOLI_ADMIN_PASSWORD:-admin}" DOLI_CRON: ${DOLI_CRON:-0} + DOLI_CRON_KEY: ${DOLI_CRON_KEY:-mycronsecurekey} DOLI_INIT_DEMO: ${DOLI_INIT_DEMO:-0} DOLI_COMPANY_NAME: ${DOLI_COMPANY_NAME:-MyBigCompany} @@ -234,6 +235,8 @@ services: DOLI_URL_ROOT: "${DOLI_URL_ROOT:-http://0.0.0.0}" DOLI_ADMIN_LOGIN: "${DOLI_ADMIN_LOGIN:-admin}" DOLI_ADMIN_PASSWORD: "${DOLI_ADMIN_PASSWORD:-admin}" + DOLI_CRON: ${DOLI_CRON:-0} + DOLI_CRON_KEY: ${DOLI_CRON_KEY:-mycronsecurekey} DOLI_INIT_DEMO: ${DOLI_INIT_DEMO:-0} WWW_USER_ID: ${WWW_USER_ID:-1000} WWW_GROUP_ID: ${WWW_GROUP_ID:-1000} diff --git a/docker-run.sh b/docker-run.sh index 6c7fa81..3986f34 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -267,6 +267,10 @@ function initializeDatabase() echo "Enable user module ..." >> /var/www/documents/initdb.log php /var/www/scripts/docker-init.php + echo "Set cron key to ${DOLI_CRON_KEY}..." + echo "Set cron key to ${DOLI_CRON_KEY}..." >> /var/www/documents/initdb.log + mysql -u ${DOLI_DB_USER} -p${DOLI_DB_PASSWORD} -h ${DOLI_DB_HOST} -P ${DOLI_DB_HOST_PORT} ${DOLI_DB_NAME} -e "UPDATE llx_const set value = '${DOLI_CRON_KEY}' WHERE name = 'CRON_KEY'" >> /var/www/documents/initdb.log 2>&1 + # Run init scripts echo "Run scripts into docker-init.d if there is ..." echo "Run scripts into docker-init.d if there is ..." >> /var/www/documents/initdb.log @@ -431,6 +435,8 @@ function run() echo "*** You can connect to the docker Mariadb with:" echo "sudo docker exec -it nameofwebcontainer-mariadb-1 bash" echo "mariadb -uroot -p'MYSQL_ROOT_PASSWORD' -h localhost" + echo "or" + echo "mariadb -uxxx -p'yyy' -h mariadb where xxx is in /run/secrets/mysql-user and yyy in /run/secrets/mysql-password" echo "ls /var/lib/mysql" echo echo "*** You can connect to the docker Dolibarr with:"