Update

obsidian/.env

@@ -0,0 +1,15 @@
+# ============================================================
+# SYSTEM SETTINGS
+# ============================================================
+TZ=America/New_York
+PUID=1000
+PGID=1000
+DATA_PATH=/home/miker/docker/obsidian
+
+# ============================================================
+# OBSIDIAN LIVESYNC / COUCHDB CONFIGURATION
+# ============================================================
+COUCHDB_USER=miker
+COUCHDB_PASSWORD=tw9222dvO91ZHb
+COUCHDB_DATABASE=obsidian
+SERVER_DOMAIN=https://obsidian.mikemcfetridge.com

obsidian/docker-compose.yml

@@ -1,30 +1,32 @@
+# Obsidian Self-Hosted LiveSync (CouchDB Engine)
 services:
   couchdb-obsidian-livesync:
+    image: docker.io/oleduc/docker-obsidian-livesync-couchdb:master
     container_name: obsidian-livesync
-#    image: couchdb:3.3.3 # Specify a stable CouchDB version
-    image: 'docker.io/oleduc/docker-obsidian-livesync-couchdb:master'
+    restart: unless-stopped
     environment:
-      # User and password for CouchDB admin access
-      - COUCHDB_USER=miker
-      - COUCHDB_PASSWORD=tw9222dvO91ZHb
-      - COUCHDB_DATABASE=obsidian
-      - SERVER_DOMAIN=https://obsidian.mikemcfetridge.com
-      # Optional: Set PUID, PGID, UMASK, and TZ for user/group permissions and timezone
-      - PUID=1000
-      - PGID=1000
-      - UMASK=0022
-      - TZ=America/New_York # Adjust timezone as needed
+      - COUCHDB_USER=${COUCHDB_USER}
+      - COUCHDB_PASSWORD=${COUCHDB_PASSWORD}
+      - COUCHDB_DATABASE=${COUCHDB_DATABASE}
+      - SERVER_DOMAIN=${SERVER_DOMAIN}
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - UMASK=002
+      - TZ=${TZ}
     volumes:
-      # Mount a local directory for CouchDB data persistence
-      - /home/miker/docker/obsidian/data:/opt/couchdb/data
-      # Mount a local directory for CouchDB configuration files
-      - /home/miker/docker/obsidian/config:/opt/couchdb/etc/local.d
+      - ${DATA_PATH}/data:/opt/couchdb/data
+      - ${DATA_PATH}/config:/opt/couchdb/etc/local.d
     ports:
-      # Map CouchDB's default port 5984 to the host machine
       - "5984:5984"
-    restart: unless-stopped # Ensure the container restarts automatically unless explicitly stopped
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:5984/_up"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 20s
     networks:
       - main
+
 networks:
   main:
-    external: true    # Tells Compose not to create this network
+    external: true