v3.2.0

Author: FlorentPoinsaut

.env.dist

@@ -1,4 +1,4 @@
-COMPOSE_FILE=tuxgasy/docker-compose.yml:docker-compose-tuxgasy.override.yml
+COMPOSE_FILE=tuxgasy/compose.yaml:compose.tuxgasy.override.yml
 COMPOSE_PROJECT_NAME=dolibarr
 
 HOSTNAME=dolibarr.domain.tld

.github/workflows/ci.yml

@@ -1,5 +1,3 @@
-# This is a basic workflow to help you get started with Actions
-
 name: CI
 
 on: [push, pull_request, workflow_dispatch]

.secrets.dist/dolibarr_admin_password.secret

@@ -0,0 +1 @@
+ChangeMeN0w!

.secrets.dist/dolibarr_admin_username.secret

@@ -0,0 +1 @@
+admin

CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- markdownlint-configure-file { "MD024": { "allow_different_nesting": true } } -->
 
+## [3.2.0] 2023-08-23
+
+### Changed
+
+- Rename the `docker-compose.*.yml` files to `compose.*.yml`
+- Use [`extends` attribute](https://docs.docker.com/compose/compose-file/05-services/#extends) to refactor dolibarr and
+  cron services
+
+### Fixed
+
+- Set cron secrets files in the environment variables of cron service
+
 ## [3.1.0] 2023-04-19
 
 ### Changed

bin/merge-tuxgasy-work.sh

@@ -29,7 +29,7 @@ git remote rm origin
 
 git filter-repo --force\
   --path-rename LICENSE:tuxgasy/LICENSE\
-  --path-rename examples/with-pgsql/docker-compose.yml:tuxgasy/docker-compose.yml\
+  --path-rename examples/with-pgsql/docker-compose.yml:tuxgasy/compose.yaml\
   --path-rename examples/with-secrets/env/dolibarr.env:tuxgasy/env/dolibarr.env\
   --path-rename examples/with-secrets/secrets/dolibarr_admin_password.secret:tuxgasy/secrets/dolibarr_admin_password.secret\
   --path-rename examples/with-secrets/secrets/dolibarr_admin_username.secret:tuxgasy/secrets/dolibarr_admin_username.secret\
@@ -54,7 +54,7 @@ sed -i\
   -e '33,35 s/./# &/'\
   -e '39,41 s/./# &/'\
   -e '44,45 s/./# &/'\
-  tuxgasy/docker-compose.yml
+  tuxgasy/compose.yaml
 
 git add tuxgasy
 git commit -m 'Adjustments of Tuxgasy files'

compose.base.yaml

@@ -0,0 +1,21 @@
+services: 
+  base:
+    env_file:
+      - ./tuxgasy/env/dolibarr.env
+    depends_on:
+      - postgres
+    environment:
+      DOLI_ADMIN_LOGIN_FILE: /run/secrets/dolibarr-admin-user
+      DOLI_ADMIN_PASSWORD_FILE: /run/secrets/dolibarr-admin-password
+      DOLI_DB_PASSWORD_FILE: /run/secrets/postgres-password
+      DOLI_DB_USER_FILE: /run/secrets/postgres-user
+    image: tuxgasy/dolibarr:latest
+    restart: unless-stopped
+    secrets:
+      - dolibarr-admin-password
+      - dolibarr-admin-user
+      - postgres-user
+      - postgres-password
+    volumes:
+      - dolibarr-docs:/var/www/documents
+      - dolibarr-custom:/var/www/html/custom

docker-compose-tuxgasy.override.yml compose.tuxgasy.override.ymldocker-compose-tuxgasy.override.yml renamed to compose.tuxgasy.override.yml

@@ -1,39 +1,22 @@
-version: '3'
-
 services: 
   cron:
-    env_file:
-      - ./env/dolibarr.env
-    depends_on:
-      - postgres
     environment:
       DOLI_CRON: 1
-      DOLI_DB_USER_FILE: /run/secrets/postgres-user
-      DOLI_DB_PASSWORD_FILE: /run/secrets/postgres-password
-      DOLI_ADMIN_LOGIN_FILE: /run/secrets/dolibarr-admin-user
-      DOLI_ADMIN_PASSWORD_FILE: /run/secrets/dolibarr-admin-password
-    image: tuxgasy/dolibarr:latest
-    restart: unless-stopped
+      DOLI_CRON_KEY_FILE: /run/secrets/dolibarr-cron-key
+      DOLI_CRON_USER_FILE: /run/secrets/dolibarr-cron-user
+    extends:
+      file: ../compose.base.yaml
+      service: base
     secrets:
       - dolibarr-admin-password
       - dolibarr-admin-user
-      - dolibarr-cron-key
-      - dolibarr-cron-user
-      - postgres-user
-      - postgres-password
-    volumes:
-      - dolibarr-docs:/var/www/documents
-      - dolibarr-custom:/var/www/html/custom
 
   dolibarr:
-    env_file:
-      - ./env/dolibarr.env
     environment:
       DOLI_URL_ROOT: "https://${HOSTNAME}"
-      DOLI_ADMIN_LOGIN_FILE: /run/secrets/dolibarr-admin-user
-      DOLI_ADMIN_PASSWORD_FILE: /run/secrets/dolibarr-admin-password
-      DOLI_DB_PASSWORD_FILE: /run/secrets/postgres-password
-      DOLI_DB_USER_FILE: /run/secrets/postgres-user
+    extends:
+      file: ../compose.base.yaml
+      service: base
     labels:
       traefik.enable: true
       traefik.http.routers.dolibarr.entrypoints: websecure
@@ -43,12 +26,6 @@ services:
     networks:
       - default
       - web
-    restart: unless-stopped
-    secrets:
-      - dolibarr-admin-password
-      - dolibarr-admin-user
-      - postgres-password
-      - postgres-user
 
   postgres:
     environment: