Refacto

.vscode/extensions.json

@@ -0,0 +1,12 @@
+{
+	"recommendations": [
+		"mikestead.dotenv",
+		"ymotongpoo.licenser",
+		"davidanson.vscode-markdownlint",
+		"ms-azuretools.vscode-docker",
+		"redhat.vscode-yaml"
+	],
+	"unwantedRecommendations": [
+
+	]
+}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "licenser.projectName": "Docker Dolibarr"
+}

bin/merge-tuxgasy-work.sh

@@ -1,4 +1,21 @@
 #!/usr/bin/env sh
+#
+# Copyright (C) 2022-2023 Solution Libre <contact@solution-libre.fr>
+# 
+# This file is part of Docker Dolibarr.
+# 
+# Docker Dolibarr is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# Docker Dolibarr is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with Docker Dolibarr.  If not, see <http://www.gnu.org/licenses/>.
 
 CWD=$(pwd)
 DIR='tuxgasy-dolibarr'

compose.tuxgasy.override.yaml

@@ -1,16 +1,4 @@
-services: 
-  cron:
-    environment:
-      DOLI_CRON: 1
-      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-cron-key
-      - dolibarr-cron-user
-
+services:
   dolibarr:
     environment:
       DOLI_URL_ROOT: "https://${HOSTNAME}"
@@ -37,21 +25,3 @@ services:
     secrets:
       - postgres-password
       - postgres-user
-
-networks:
-  web:
-    external: true
-
-secrets:
-  dolibarr-admin-password:
-    file: ../.secrets/dolibarr_admin_password.secret
-  dolibarr-admin-user:
-    file: ../.secrets/dolibarr_admin_username.secret
-  dolibarr-cron-key:
-    file: ../.secrets/dolibarr_cron_key.secret
-  dolibarr-cron-user:
-    file: ../.secrets/dolibarr_cron_user.secret
-  postgres-password:
-    file: ../.secrets/postgres_password.secret
-  postgres-user:
-    file: ../.secrets/postgres_user.secret

compose.yaml

@@ -2,3 +2,34 @@ include:
   - path: 
       - tuxgasy/compose.yaml
       - compose.tuxgasy.override.yaml
+
+networks:
+  web:
+    external: true
+
+secrets:
+  dolibarr-admin-password:
+    file: .secrets/dolibarr_admin_password.secret
+  dolibarr-admin-user:
+    file: .secrets/dolibarr_admin_username.secret
+  dolibarr-cron-key:
+    file: .secrets/dolibarr_cron_key.secret
+  dolibarr-cron-user:
+    file: .secrets/dolibarr_cron_user.secret
+  postgres-password:
+    file: .secrets/postgres_password.secret
+  postgres-user:
+    file: .secrets/postgres_user.secret
+
+services:
+  cron:
+    environment:
+      DOLI_CRON: 1
+      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-cron-key
+      - dolibarr-cron-user