Merge branch 'master' into master

gitea/Dockerfile

@@ -102,3 +102,16 @@ LABEL \
     org.opencontainers.image.created=${BUILD_DATE} \
     org.opencontainers.image.revision=${BUILD_REF} \
     org.opencontainers.image.version=${BUILD_VERSION}
+
+#################
+# 6 Healthcheck #
+#################
+
+ENV HEALTH_PORT="3000" \
+    HEALTH_URL=""
+HEALTHCHECK \
+    --interval=5s \
+    --retries=5 \
+    --start-period=30s \
+    --timeout=25s \
+    CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1

gitea/README.md

@@ -14,6 +14,10 @@
 
 _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_
 
+[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers)
+
+![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/gitea/stats.png)
+
 ## About
 
 Various tweaks and configuration options addition.

gitea/build.json

@@ -1,7 +1,7 @@
 {
   "build_from": {
-    "aarch64": "gitea/gitea:1.18.4",
-    "amd64": "gitea/gitea:1.18.4"
+    "aarch64": "gitea/gitea:1.18.5",
+    "amd64": "gitea/gitea:1.18.5"
   },
   "codenotary": {
     "signer": "alexandrep.github@gmail.com"

gitea/config.json

@@ -37,10 +37,6 @@
   },
   "slug": "gitea",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/gitea",
-<<<<<<< Updated upstream
-  "version": "1.18.4",
-=======
   "version": "1.19.1",
->>>>>>> Stashed changes
   "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]"
 }

gitea/rootfs/entrypoint.sh

@@ -1,17 +1,6 @@
 #!/bin/bash
 echo "Starting..."
 
-############################
-# Backup Dockerfile Script #
-############################
-
-if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then
-    chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh
-    chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh
-    /./etc/cont-init.d/00-aaa_dockerfile_backup.sh
-    rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh
-fi
-
 ####################
 # Starting scripts #
 ####################

gitea/translations/en.yaml

@@ -96,6 +96,9 @@ configuration:
   database:
     name: database
     description: Type of database to use
+  disable_updates:
+    name: disable_updates
+    description: App updates won't be done automatically but must be done with the webui
   DB_CLIENT:
     name: DB_CLIENT
     description: See upstream app documentation
@@ -503,7 +506,7 @@ configuration:
     description: See upstream app documentation
   whitelist:
     name: whitelist
-    description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password'
+    description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui'
   WHOOGLE_ALT_IG:
     name: WHOOGLE_ALT_IG
     description: See upstream app documentation

gitea/updater.json

@@ -1,16 +1,8 @@
 {
-<<<<<<< Updated upstream
-  "last_update": "20-02-2023",
-=======
-  "last_update": "13-04-2023",
->>>>>>> Stashed changes
+  "last_update": "24-03-2023",
   "repository": "alexbelgium/hassio-addons",
   "slug": "gitea",
   "source": "github",
   "upstream_repo": "go-gitea/gitea",
-<<<<<<< Updated upstream
-  "upstream_version": "1.18.4"
-=======
   "upstream_version": "1.19.1"
->>>>>>> Stashed changes
 }