From dfb9081d4e9db3d93106dcefadadf2ea1030c26f Mon Sep 17 00:00:00 2001
From: Sylvain Autran <dev@sylvainautran.com>
Date: Sun, 18 Aug 2024 12:32:20 +0200
Subject: [PATCH 1/2] Add traccar to service templates

---
 templates/compose/traccar.yml | 48 +++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 templates/compose/traccar.yml

diff --git a/templates/compose/traccar.yml b/templates/compose/traccar.yml
new file mode 100644
index 000000000..d22385a75
--- /dev/null
+++ b/templates/compose/traccar.yml
@@ -0,0 +1,48 @@
+# documentation: https://www.traccar.org/documentation/
+# slogan: Traccar is a free and open source modern GPS tracking system.
+# tags: traccar,gps,tracking,open,source
+# logo: 
+# port: 8082
+
+services:
+  traccar:
+    image: traccar/traccar
+    environment:
+      - SERVICE_FQDN_TRACCAR_8082
+      - SERVICE_FQDN_TRACCAR_5159=/api
+      - CONFIG_USE_ENVIRONMENT_VARIABLES=true
+      - DATABASE_USER=$SERVICE_USER_POSTGRES
+      - DATABASE_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+    volumes:
+      - type: bind
+        source: ./srv/traccar/conf/traccar.xml
+        target: /opt/traccar/conf/traccar.xml
+        content: |
+          <?xml version='1.0' encoding='UTF-8'?>
+          <!DOCTYPE properties SYSTEM 'http://java.sun.com/dtd/properties.dtd'>
+          <properties>
+              <entry key='config.default'>./conf/default.xml</entry>
+              <entry key='database.driver'>org.postgresql.Driver</entry>
+              <entry key='database.url'>jdbc:postgresql://postgres:5432/traccar</entry>
+          </properties>
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://127.0.0.1:8082"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+    depends_on:
+      postgres:
+        condition: service_healthy
+  postgres:
+    image: postgres:16-alpine
+    environment:
+      - POSTGRES_USER=$SERVICE_USER_POSTGRES
+      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - POSTGRES_DB=traccar
+    volumes:
+      - traccar-db-data:/var/lib/postgresql/data/
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 20s
+      retries: 10

From fd4316e2ed29bb9d6b44ce78d091d9ad3b3f22d1 Mon Sep 17 00:00:00 2001
From: Sylvain Autran <dev@sylvainautran.com>
Date: Sun, 18 Aug 2024 13:10:19 +0200
Subject: [PATCH 2/2] Update traccar.yml

---
 templates/compose/traccar.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/templates/compose/traccar.yml b/templates/compose/traccar.yml
index d22385a75..00ba1b699 100644
--- a/templates/compose/traccar.yml
+++ b/templates/compose/traccar.yml
@@ -9,7 +9,7 @@ services:
     image: traccar/traccar
     environment:
       - SERVICE_FQDN_TRACCAR_8082
-      - SERVICE_FQDN_TRACCAR_5159=/api
+      - SERVICE_FQDN_TRACCAR_API_5159
       - CONFIG_USE_ENVIRONMENT_VARIABLES=true
       - DATABASE_USER=$SERVICE_USER_POSTGRES
       - DATABASE_PASSWORD=$SERVICE_PASSWORD_POSTGRES
@@ -25,11 +25,6 @@ services:
               <entry key='database.driver'>org.postgresql.Driver</entry>
               <entry key='database.url'>jdbc:postgresql://postgres:5432/traccar</entry>
           </properties>
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://127.0.0.1:8082"]
-      interval: 5s
-      timeout: 20s
-      retries: 10
     depends_on:
       postgres:
         condition: service_healthy