Adding healthcheck for mariadb and updating depends_on.

Merged by Trez.One

.gitea/workflows/deployment.yml

@@ -26,13 +26,15 @@ jobs:
         run: |
           tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           tea login default gitea-rinoa
-          echo "Checking if PR exists for ${{ github.ref_name }}..."
+          echo "Checking if PR exists for ${{ github.ref_name }}"
-          tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep '${{ github.ref_name }}' | head -1 | egrep -q 'open'
+          tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state
-          if [ $? -eq 0 ]; then
+          pr_state=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep '${{ gitea.ref_name }}' | head -1 |awk -F, '{print $4}' | sed -e 's|"||g')
-            echo "An open PR exists, skipping creation..."
+          echo "PR state: ${pr_state}"
-          elif [ $? -eq 1 ]; then
+          if [ "${pr_state}" != 'open' ]; then
-            echo "No open PRs, creating one..."
+            echo "PR does not exist, creating..."
             tea pr c -r "${{ github.repository }}" -t "Automated PR for ${{ github.ref_name }}" -d "Automated PR for ${{ github.ref_name }}"
+          elif [ "${pr_state}" = 'open' ]; then
+            echo "PR already exists, skipping creation..."
           fi
 
   docker-compose-test:

docker-compose.yml

@@ -557,9 +557,8 @@ services:
     container_name: castopod
     depends_on:
       mariadb:
-        condition: service_started
+        condition: service_healthy
         required: true
-        restart: true
     environment:
       MYSQL_DATABASE: castopod
       MYSQL_USER: castopod
@@ -1100,7 +1099,7 @@ services:
     container_name: ghost_blog
     depends_on:
       mariadb:
-        condition: service_started
+        condition: service_healthy
         required: true
         restart: true
     environment:
@@ -1157,7 +1156,7 @@ services:
       GITEA__mailer__SMTP_PORT: 25
       GITEA__mailer__USER: ${POSTAL_SMTP_AUTH_USER}
       GITEA__mailer__PASSWD: ${POSTAL_SMTP_AUTH_PASSWORD}
-    image: gitea/gitea:1.22.6
+    image: gitea/gitea:1.23.1
     labels:
       homepage.group: Code/DevOps
       homepage.name: Gitea
@@ -1185,7 +1184,7 @@ services:
     restart: always
     volumes:
       - source: ${DOCKER_VOLUME_CONFIG}/gitea
-        target: /data
+        target: /data/gitea
         type: bind
         bind:
           create_host_path: true
@@ -1707,9 +1706,8 @@ services:
     container_name: hortusfox
     depends_on:
       mariadb:
-        condition: service_started
+        condition: service_healthy
         required: true
-        restart: true
     environment:
       APP_ADMIN_EMAIL: charish.patel@trez.wtf
       APP_ADMIN_PASSWORD: ${HORTUSFOX_ADMIN_PASSWORD}
@@ -1872,11 +1870,6 @@ services:
           create_host_path: true
   invoice_ninja:
     container_name: invoice_ninja
-    depends_on:
-      mariadb:
-        condition: service_started
-        required: true
-        restart: true
     environment:
       APP_DEBUG: true
       APP_KEY: ${IN_APP_KEY}
@@ -3035,8 +3028,13 @@ services:
       PUID: 1000
       TZ: America/New_York
       MYSQL_PASSWORD: VQU23wHKRNmfpAPt5E9BxMaSGJdWjLuz
+    healthcheck:
+      test: "/usr/bin/mariadb -u root -p${MARIADB_ENVIRONMENT_MYSQL_ROOT_PASSWORD} -e \"SHOW DATABASES;\""
+      interval: 30s
+      timeout: 3s
+      retries: 5
     hostname: Rinoa
-    image: ghcr.io/linuxserver/mariadb
+    image: linuxserver/mariadb
     networks:
       default: null
     ports:
@@ -3322,9 +3320,8 @@ services:
     container_name: nextcloud
     depends_on:
       mariadb:
-        condition: service_started
+        condition: service_healthy
         required: true
-        restart: true
     environment:
       PGID: 1000
       PUID: 1000
@@ -3439,9 +3436,8 @@ services:
     container_name: paperless-ngx
     depends_on:
       mariadb:
-        condition: service_started
+        condition: service_healthy
         required: true
-        restart: true
     environment:
       PAPERLESS_DBENGINE: mariadb
       PAPERLESS_DBHOST: mariadb
@@ -6089,9 +6085,8 @@ services:
     container_name: wallabag
     depends_on:
       mariadb:
-        condition: service_started
+        condition: service_healthy
         required: true
-        restart: true
       redis:
         condition: service_started
         required: true