chore: publish 3.0.0+2.2.1 release

This reverts commit 4be91e3fe6.

.env.sample

@@ -10,6 +10,8 @@ DOMAIN=uptime-kuma.example.com
 SECRET_DB_PASSWORD_VERSION=v1
 SECRET_DB_ROOT_PASSWORD_VERSION=v1
 
-
-## Enable mariadb
+## Enable mariadb, otherwise sqlite will be used
 #COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
+
+# only for testing branches of uptime-kuma
+#UPTIME_KUMA_GH_REPO=<branch name>

.gitea/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,17 @@
+---
+name: "Uptime Kuma pull request template"
+about: "Uptime Kuma pull request template"
+---
+
+<!-- 
+Thank you for doing recipe maintenance work!
+Please mark all checklist items which are relevant for your changes.
+Please remove the checklist items which are not relevant for your changes.
+Feel free to remove this comment.
+-->
+
+* [ ] I have deployed and tested my changes
+* [ ] I have [updated relevant versions in `abra.sh`](https://docs.coopcloud.tech/maintainers/upgrade/#updating-versions-in-the-abrash)
+* [ ] I have made my environment variable changes [backwards compatible](https://docs.coopcloud.tech/maintainers/upgrade/#backwards-compatible-environment-variable-changes)
+* [ ] I ran `abra recipe lint uptime-kuma --chaos` on the PR's branch and fixed the warnings.
+* [ ] I have added a [release note entry](https://docs.coopcloud.tech/maintainers/upgrade/#creating-new-release-notes)

README.md

@@ -1,14 +1,19 @@
 # uptime-kuma
 
-> One line description of the recipe
+[![Build Status](https://build.coopcloud.tech/api/badges/coop-cloud/uptime-kuma/status.svg)](https://build.coopcloud.tech/coop-cloud/uptime-kuma)
+
+
+> A fancy self-hosted monitoring tool 
 
 <!-- metadata -->
 
-* **Category**: Apps
-* **Status**: 0
+* **Maintainer**: [@stevensting](https://git.coopcloud.tech/stevensting)
+* **Status**: `stable`
+* **Category**: Utilities
+* **Features**: ?
 * **Image**: [`uptime-kuma`](https://hub.docker.com/r/uptime-kuma), 4, upstream
-* **Healthcheck**: No
-* **Backups**: No
+* **Healthcheck**: Yes
+* **Backups**: Yes
 * **Email**: No
 * **Tests**: No
 * **SSO**: No
@@ -25,7 +30,7 @@ For more, see [`docs.coopcloud.tech`](https://docs.coopcloud.tech).
 
 ## MariaDB
 
-By default uptime-kuma uses a sqlite database. It is possible to switch to a mariadb:
+By default uptime-kuma uses a sqlite database. It is possible to switch to a mariadb by:
 ```
 #COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
 ```

abra.sh

@@ -1 +1,5 @@
-export APP_ENTRYPOINT_VERSION=v2
+export APP_ENTRYPOINT_VERSION=v3
+
+get_all_urls() {
+  echo "select url from monitor" | mariadb -u kuma -p$(cat /run/secrets/db_password) -D kuma | sed 's|https://||' | sed 's|/.*||' | sort
+}

compose.mariadb.yml

@@ -5,8 +5,9 @@ services:
   app:
     secrets:
       - db_password
+    networks:
+      - internal
     environment:
-      - UPTIME_KUMA_GH_REPO=louislam:uptime-kuma
       - UPTIME_KUMA_DB_TYPE=mariadb
       - UPTIME_KUMA_DB_HOSTNAME=db
       - UPTIME_KUMA_DB_PORT=3306
@@ -17,7 +18,7 @@ services:
       - db
 
   db:
-    image: mariadb:11.7
+    image: mariadb:11.8
     environment:
       - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
       - MYSQL_PASSWORD_FILE=/run/secrets/db_password
@@ -30,10 +31,25 @@ services:
     secrets:
       - db_password
       - db_root_password
+    deploy:
+      labels:
+        backupbot.backup: "${ENABLE_BACKUPS:-true}"
+        backupbot.backup.pre-hook: "mariadb-dump --single-transaction -u root -p\"$$(cat /run/secrets/db_root_password)\" kuma | gzip > /var/lib/mysql/dump.sql.gz"
+        backupbot.backup.volumes.mariadb.path: "dump.sql.gz"
+        backupbot.restore.post-hook: "gzip -d /var/lib/mysql/dump.sql.gz && mariadb -u root -p\"$$(cat /run/secrets/db_root_password)\" kuma < /var/lib/mysql/dump.sql && rm -f /var/lib/mysql/dump.sql"
+    healthcheck:
+      test: ["CMD-SHELL", 'mariadb-admin -p"$$(cat $MYSQL_ROOT_PASSWORD_FILE)"  ping']
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 1m
 
 volumes:
   mariadb:
 
+networks:
+  internal:
+
 secrets:
   db_password:
     external: true

compose.yml

@@ -3,28 +3,20 @@ version: "3.8"
 
 services:
   app:
-    image: louislam/uptime-kuma:2.0.0-beta.1
+    image: louislam/uptime-kuma:2.2.1
     volumes:
       - data:/app/data
-    secrets:
-      - db_password
     networks:
-      - internal
       - proxy
     environment:
-      - UPTIME_KUMA_GH_REPO=louislam:uptime-kuma
+      - UPTIME_KUMA_GH_REPO
       - UPTIME_KUMA_DB_TYPE=sqlite
-    depends_on:
-      - db
     configs:
       - source: app_entrypoint
         target: /docker-entrypoint.sh
         mode: 0555
     entrypoint: /docker-entrypoint.sh
     deploy:
-      update_config:
-        failure_action: rollback
-        order: start-first
       labels:
         - "traefik.enable=true"
         - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=3001"
@@ -35,44 +27,21 @@ services:
         #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
-        - "coop-cloud.${STACK_NAME}.version=2.0.0+2.0.0-beta.1"
+        - "coop-cloud.${STACK_NAME}.version=3.0.0+2.2.1"
+        - "backupbot.backup=${ENABLE_BACKUPS:-true}"
     healthcheck:
       test: "curl -L localhost:3001"
       interval: 30s
       timeout: 10s 
       retries: 5 
       start_period: 2m
-  db:
-    image: mariadb:11.7
-    environment:
-      - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
-      - MYSQL_PASSWORD_FILE=/run/secrets/db_password
-      - MYSQL_USER=kuma
-      - MYSQL_DATABASE=kuma
-    volumes:
-      - mariadb:/var/lib/mysql
-    networks:
-      - internal
-    secrets:
-      - db_password
-      - db_root_password
 
 volumes:
-  mariadb:
   data:
 
 networks:
   proxy:
     external: true
-  internal:
-
-secrets:
-  db_password:
-    external: true
-    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
-  db_root_password:
-    external: true
-    name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
 
 configs:
   app_entrypoint:

entrypoint.sh.tmpl

@@ -24,7 +24,7 @@ file_env() {
    unset "$fileVar"
 }
 
-file_env "UPTIME_KUMA_DB_PASSWORD"
+#file_env "UPTIME_KUMA_DB_PASSWORD"
 
 # upstream startup command
 cd /app

release/3.0.0+2.2.1

@@ -0,0 +1 @@
+In case you are currently using MariaDb instead of the internal sqlite, you need to activate the usage of compose.mariadb.yaml in your env file. (compare .env.sample) Reason for this is that the mariadb container was removed from compose.yml

renovate.json

@@ -0,0 +1,9 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ],
+  "reviewers": [
+    "stevensting"
+  ]
+}