- Fix database healthcheck!

ReleaseNotes.txt

@@ -1,3 +1,13 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/Ampache-Mga9 V 1.2.3 - A. GIBERT - 2024/10/xx
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Fix crontab: user ampache user instead of root and add it to git,
+- Fix database restart in compose file,
+- Add database healthcheck & webapp service depencies.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3/Ampache-Mga9 V 1.2.2 - A. GIBERT - 2024/10/06
 ------------------------------------------------------------------------------------------------------------------------------------

compose.yaml

@@ -9,6 +9,8 @@ services:
     
     image: ${DATABASE_IMG}
     
+    restart: unless-stopped
+    
     environment:
       MARIADB_UID:           ${MARIADB_UID}
       MARIADB_GID:           ${MARIADB_GID}
@@ -18,6 +20,12 @@ services:
       MARIADB_USER:          ${MARIADB_USER}
       MARIADB_PASSWORD:      ${MARIADB_PASSWORD}
 
+    healthcheck:
+      test: ["CMD", 'mysqladmin', 'ping', '-h', 'localhost', '-u', 'root', '-p${MARIADB_ROOT_PASSWORD}' ]
+      interval: 10s
+      timeout: 3s
+      retries: 3
+      
     volumes:
       - ./var/lib/mysql:/var/lib/mysql
       
@@ -44,6 +52,10 @@ services:
         
     restart: unless-stopped
     
+    depends_on:
+      database:
+        condition: service_healthy
+        
     environment:
       APACHE_UID:      ${APACHE_UID}
       APACHE_GID:      ${APACHE_GID}
@@ -55,7 +67,7 @@ services:
       - ./etc/cron.d/ampache:/etc/cron.d/ampache:ro
       - /etc/passwd:/etc/passwd:ro
       - /etc/group:/etc/group:ro
-      - /etc/shadow:/etc/shadow:ro      
+      - /etc/shadow:/etc/shadow:ro
       - ${MUSIC_REPO}:/media/music
       - ${VIDEO_REPO}:/media/video
       
@@ -73,6 +85,10 @@ services:
     
     restart: unless-stopped
     
+    depends_on:
+      database:
+        condition: service_healthy
+        
     environment:
       APACHE_UID:      ${APACHE_UID}
       APACHE_GID:      ${APACHE_GID}

etc/cron.d/.gitignore

@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore

etc/cron.d/ampache

@@ -0,0 +1,5 @@
+# /etc/cron.d/ampache: crontab fragment for ampache server
+
+PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/sbin
+
+15      3       *       *       *       apache    cd /var/www; php bin/cli run:updateCatalog -v -c -e -a -g >/var/log/ampache/catalog_update.log 2>&1