From af853e0c0f239702a1e2bb89ed4207de083a3cca Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 9 Nov 2023 15:56:37 +0100 Subject: [PATCH 1/4] add clean docker compose --- docker-compose.yml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4fa2e04..b5d824d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,19 +4,24 @@ services: mariadb: image: mariadb:latest environment: - MYSQL_ROOT_PASSWORD: root - MYSQL_DATABASE: dolibarr - + MYSQL_ROOT_PASSWORD: ${DB_PASS} + MYSQL_DATABASE: ${DB_NAME} + volumes: + - database:/var/lib/mysql + restart: always web: image: tuxgasy/dolibarr environment: DOLI_DB_HOST: mariadb DOLI_DB_USER: root - DOLI_DB_PASSWORD: root - DOLI_DB_NAME: dolibarr - DOLI_URL_ROOT: 'http://0.0.0.0' - PHP_INI_DATE_TIMEZONE: 'Europe/Paris' + DOLI_DB_PASSWORD: ${DB_PASS} + DOLI_DB_NAME: ${DB_NAME} + DOLI_URL_ROOT: ${DOLI_URL} + PHP_INI_DATE_TIMEZONE: ${TIME_ZONE} + restart: always ports: - - "80:80" - links: + - "80:80" + depends_on: - mariadb +volumes: + database: From bc64c4bc6cc76fd0d784ec24b7e0f08f1e765426 Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 9 Nov 2023 15:57:14 +0100 Subject: [PATCH 2/4] add env example --- .env.example | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .env.example diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..ec636a3 --- /dev/null +++ b/.env.example @@ -0,0 +1,4 @@ +TIME_ZONE='Europe/Paris' +DOLI_URL='http://0.0.0.0' +DB_NAME="dolibarr" +DB_PASS="password" From 24f8b5ea9022772f5b3567be81ea7eb66e7e9a21 Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 9 Nov 2023 16:11:52 +0100 Subject: [PATCH 3/4] rm port for test --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b5d824d..ee1200a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,8 +19,8 @@ services: DOLI_URL_ROOT: ${DOLI_URL} PHP_INI_DATE_TIMEZONE: ${TIME_ZONE} restart: always - ports: - - "80:80" + # ports: + # - "80:80" depends_on: - mariadb volumes: From 404215e3aba85b4a3431fa9f8971085087e5ec79 Mon Sep 17 00:00:00 2001 From: Clement Date: Fri, 10 Nov 2023 11:49:09 +0100 Subject: [PATCH 4/4] add env to ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 1fe39c9..5df975e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ # Aptatio/Platformio specifics secrets.ini +.env