fix backup label

.env.sample

@@ -19,12 +19,6 @@ GITEA_ENABLE_OPENID_SIGNIN=true
 GITEA_ENABLE_OPENID_SIGNUP=true
 GITEA_DISABLE_GRAVATAR=false
 GITEA_ENABLE_FEDERATED_AVATAR=true
-GITEA_LANDING_PAGE=organizations
-
-GITEA_REPO_UPLOAD_ENABLED=true
-GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/*
-GITEA_REPO_UPLOAD_MAX_SIZE=50
-GITEA_REPO_UPLOAD_MAX_FILES=5
 
 GITEA_MAILER_FROM=noreply@example.com
 GITEA_MAILER_USER=noreply@example.com
@@ -51,8 +45,3 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
 # GITEA_UPDATE_AVATAR=replace-me
 # GITEA_ACCOUNT_LINKING=replace-me
 # GITEA_OAUTH2_CLIENT_ENABLED=replace-me
-
-# Indexer (for issue search)
-# GITEA_REPO_INDEXER_ENABLED=false
-# GITEA_ISSUE_INDEXER_TYPE=db
-# GITEA_STARTUP_TIMEOUT=-1

README.md

@@ -4,11 +4,11 @@
 
 <!-- metadata -->
 * **Category**: Development
-* **Status**: 5
+* **Status**: 3, stable
 * **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), 4, upstream
 * **Healthcheck**: Yes
 * **Backups**: Yes
-* **Email**: Yes
+* **Email**: ?
 * **Tests**: 2
 * **SSO**: 3 (OAuth)
 <!-- endmetadata -->

abra.sh

@@ -1,4 +1,4 @@
-export APP_INI_VERSION=v17
+export APP_INI_VERSION=v9
 export DOCKER_SETUP_SH_VERSION=v1
 
 abra_backup_app() {

app.ini.tmpl

@@ -24,21 +24,12 @@ ENABLE_OPENID_SIGNUP = {{ env "GITEA_ENABLE_OPENID_SIGNUP" }}
 [repository]
 DEFAULT_BRANCH = main
 
-[repository.upload]
-ENABLED = {{ env "GITEA_REPO_UPLOAD_ENABLED" }}
-ALLOWED_TYPES = {{ env "GITEA_REPO_UPLOAD_ALLOWED_TYPES" }}
-FILE_MAX_SIZE = {{ env "GITEA_REPO_UPLOAD_MAX_SIZE" }}
-MAX_FILES = {{ env "GITEA_REPO_UPLOAD_MAX_FILES" }}
-
-
 [indexer]
-REPO_INDEXER_ENABLED = {{ or (env "GITEA_REPO_INDEXER_ENABLED") "false" }}
-ISSUE_INDEXER_TYPE= {{ or (env "GITEA_ISSUE_INDEXER_TYPE") "db" }}
-STARTUP_TIMEOUT = {{ or (env "GITEA_STARTUP_TIMEOUT") "-1" }}
+STARTUP_TIMEOUT = 0
 
 [server]
 DOMAIN = {{ env "GITEA_DOMAIN" }}
-LANDING_PAGE = {{ env "GITEA_LANDING_PAGE" }}
+LANDING_PAGE = organizations
 ROOT_URL = https://%(DOMAIN)s/
 SSH_DOMAIN = {{ env "GITEA_DOMAIN" }}
 SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }}

compose.forgejo.yml

@@ -2,4 +2,4 @@ version: '3.8'
 
 services:
   app:
-    image: codeberg.org/forgejo/forgejo:1.19.3-0-rootless
+    image: codeberg.org/forgejo/forgejo:1.20.1-0-rootless

compose.mariadb.yml

@@ -9,6 +9,12 @@ services:
       - GITEA_DB_USER=gitea
   db:
     image: "mariadb:10.11.2"
+    deploy:
+      labels:
+          backupbot.backup: "true"
+          backupbot.backup.pre-hook: 'mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" gitea > /var/lib/mysql/backup.sql'
+          backupbot.backup.post-hook: "rm -rf /var/lib/mysql/backup.sql"
+          backupbot.backup.path: "/var/lib/mysql/backup.sql"
     command: |
       mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     environment:

compose.postgres.yml

@@ -8,7 +8,13 @@ services:
       - GITEA_DB_NAME=gitea
       - GITEA_DB_USER=gitea
   db:
-    image: postgres:15.5
+    image: postgres:15.3
+    deploy:
+      labels:
+          backupbot.backup: "true"
+          backupbot.backup.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql"
+          backupbot.backup.post-hook: "rm -r /var/lib/postgresql/data/backup.sql"
+          backupbot.backup.path: "/var/lib/postgresql/data"
     environment: 
       - POSTGRES_DB=gitea
       - POSTGRES_USER=gitea

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: "gitea/gitea:1.21.10-rootless"
+    image: "gitea/gitea:1.20.1-rootless"
     configs:
       - source: app_ini
         target: /etc/gitea/app.ini
@@ -35,14 +35,6 @@ services:
       - GITEA_ACCOUNT_LINKING
       - GITEA_OAUTH2_CLIENT_ENABLED
       - GITEA_CORS_ALLOW_DOMAIN
-      - GITEA_LANDING_PAGE
-      - GITEA_REPO_UPLOAD_ENABLED
-      - GITEA_REPO_UPLOAD_ALLOWED_TYPES
-      - GITEA_REPO_UPLOAD_MAX_SIZE
-      - GITEA_REPO_UPLOAD_MAX_FILES
-      - GITEA_REPO_INDEXER_ENABLED
-      - GITEA_ISSUE_INDEXER_TYPE
-      - GITEA_STARTUP_TIMEOUT
     volumes:
       - data:/var/lib/gitea
       - config:/etc/gitea
@@ -51,17 +43,12 @@ services:
     networks:
       - proxy
       - internal
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:3000/api/healthz"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 1m
     deploy:
       update_config:
         failure_action: rollback
         order: start-first
       labels:
+        - "backupbot.backup=true"
         - "traefik.enable=true"
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
@@ -75,7 +62,7 @@ services:
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}"
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100"
         - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true"
-        - coop-cloud.${STACK_NAME}.version=2.6.2+1.21.10-rootless
+        - coop-cloud.${STACK_NAME}.version=2.3.0+1.20.1-rootless
 
 
 networks:

release/2.6.0+1.21.5-rootless

@@ -1 +0,0 @@
-This release adds a docker healthcheck for the main Gitea service -- please pay careful attention when updating apps, and as always feel free to ask in Matrix if you run into any bugs 🐛