diff --git a/.env.sample b/.env.sample index 6f79f3d7201f0cf2699b29bd75d78fc9e9533487..59bab615e655cea843ba823ee43ccf0926863f9f 100644 --- a/.env.sample +++ b/.env.sample @@ -1,3 +1,7 @@ +COMPOSE_FILE=docker-compose.yml:dev.yml +ENV=local +CRON_KEY="getItFromDolibarrScheduledJobModulePageThanRestart" +CRON_USER="admin" PORT=8080 DOLI_URL=http://localhost:8080 DOLI_VERSION=11.0.3 diff --git a/dev.yml b/dev.yml new file mode 100644 index 0000000000000000000000000000000000000000..a698b9031c7f73c576b7331183996b903a7f46cd --- /dev/null +++ b/dev.yml @@ -0,0 +1,6 @@ +version: "3" + +services: + dolibarr: + ports: + - "${PORT}:80" diff --git a/docker-compose.yml b/docker-compose.yml index 051d569e757d074c4bb223f2b4d733eb49be4257..f195406ee44132b8820e9aefd383c4e250f6e84b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,8 +25,9 @@ services: DOLI_DB_NAME: dolibarr DOLI_URL_ROOT: ${DOLI_URL} PHP_INI_DATE_TIMEZONE: 'Europe/Paris' - ports: - - "${PORT}:80" + CRON_KEY: ${CRON_KEY} + CRON_USER: ${CRON_USER} + ENV: ${ENV} restart: ${RESTART} links: - mariadb diff --git a/docker/Dockerfile b/docker/Dockerfile index 1990986fe2986210f8b67562b4e3d919d8377cc5..a089197744969f2ac727f6c29d0d99546ff5ad0e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get install -y \ chromium-driver\ chromium\ curl \ + cron \ git\ gnupg\ libldap2-dev\ diff --git a/docker/dolibarr.ini b/docker/dolibarr.ini index 02766ccec0c2960cc18f9c876bc170753f6b6315..cb7204629150d41113eb575467aaf1b4f0fbbb74 100644 --- a/docker/dolibarr.ini +++ b/docker/dolibarr.ini @@ -1,6 +1,8 @@ error_reporting = E_ALL display_errors = On display_startup_errors = On -xdebug.remote_port=9000 -xdebug.remote_enable=1 -xdebug.remote_connect_back=1 +[xdebug] +xdebug.client_port=9000 +xdebug.mode=debug +xdebug.start_with_request=yes +xdebug.discover_client_host=true diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 68b77d58fc5f49d1a57b9dda91176353b9c91e14..7fc3abcaeab270b684e313bc715879dd270afe3a 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -7,5 +7,12 @@ fi cd /var/www/dolibarr git fetch git checkout $DOLI_VERSION +if [ "$ENV" == "prod" ]; then + sed -i '/\(xdebug.*\)/d' /etc/php/$PHP_VER/fpm/conf.d/00-dolibarr.ini + sed -i '/\(xdebug.*\)/d' /etc/php/$PHP_VER/cli/conf.d/00-dolibarr.ini + apt-get purge -y php-xdebug +fi +echo "*/5 * * * * www-data /usr/bin/php /var/www/dolibarr/scripts/cron/cron_run_jobs.php $CRON_KEY $CRON_USER > /var/www/dolibarr/documents/cron_run_jobs.php.log" >> /etc/crontab php-fpm$PHP_VER -D +cron -f & apache2ctl -DFOREGROUND