chore: publish 2.9.1+1.22.0-rootless release

Reviewed-on: #36
Reviewed-by: decentral1se <decentral1se@noreply.git.coopcloud.tech>

.env.sample

@@ -20,6 +20,15 @@ GITEA_ENABLE_OPENID_SIGNUP=true
 GITEA_DISABLE_GRAVATAR=false
 GITEA_ENABLE_FEDERATED_AVATAR=true
 GITEA_LANDING_PAGE=organizations
+GITEA_SHOW_USER_EMAIL=false
+GITEA_DISABLE_REGULAR_ORG_CREATION=true
+GITEA_DEFAULT_KEEP_EMAIL_PRIVATE=true
+GITEA_DEFAULT_ALLOW_CREATE_ORGANIZATION=false
+GITEA_ENABLE_USER_HEATMAP=false
+GITEA_DEFAULT_USER_VISIBILITY=limited
+GITEA_ALLOWED_USER_VISIBILITY_MODES=limited,private
+GITEA_DEFAULT_ORG_VISIBILITY=limited
+GITEA_REQUIRE_SIGNIN_VIEW=true
 
 GITEA_REPO_UPLOAD_ENABLED=true
 GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/*
@@ -54,4 +63,5 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
 
 # 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**: 3, stable
+* **Status**: 5
 * **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), 4, upstream
 * **Healthcheck**: Yes
 * **Backups**: Yes
-* **Email**: ?
+* **Email**: Yes
 * **Tests**: 2
 * **SSO**: 3 (OAuth)
 <!-- endmetadata -->

abra.sh

@@ -1,4 +1,4 @@
-export APP_INI_VERSION=v16
+export APP_INI_VERSION=v18
 export DOCKER_SETUP_SH_VERSION=v1
 
 abra_backup_app() {

app.ini.tmpl

@@ -16,6 +16,13 @@ ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ env "GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATIO
 AUTO_WATCH_NEW_REPOS = {{ env "GITEA_AUTO_WATCH_NEW_REPOS" }}
 DISABLE_REGISTRATION = {{ env "GITEA_DISABLE_REGISTRATION" }}
 ENABLE_NOTIFY_MAIL = {{ env "GITEA_ENABLE_NOTIFY_MAIL" }}
+DEFAULT_KEEP_EMAIL_PRIVATE = {{ env "GITEA_DEFAULT_KEEP_EMAIL_PRIVATE" }}
+DEFAULT_ALLOW_CREATE_ORGANIZATION = {{ env "GITEA_DEFAULT_ALLOW_CREATE_ORGANIZATION" }}
+ENABLE_USER_HEATMAP = {{ env "GITEA_ENABLE_USER_HEATMAP" }}
+DEFAULT_USER_VISIBILITY = {{ env "GITEA_DEFAULT_USER_VISIBILITY" }}
+ALLOWED_USER_VISIBILITY_MODES = {{ env "GITEA_ALLOWED_USER_VISIBILITY_MODES" }}
+DEFAULT_ORG_VISIBILITY = {{ env "GITEA_DEFAULT_ORG_VISIBILITY" }}
+REQUIRE_SIGNIN_VIEW = {{ env "GITEA_REQUIRE_SIGNIN_VIEW" }}
 
 [openid]
 ENABLE_OPENID_SIGNIN = {{ env "GITEA_ENABLE_OPENID_SIGNIN" }}
@@ -30,9 +37,12 @@ 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" }}
 
+[ui]
+SHOW_USER_EMAIL = {{ env "GITEA_SHOW_USER_EMAIL" }}
 
 [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" }}
 
 [server]
@@ -51,6 +61,9 @@ REVERSE_PROXY_LIMIT = 1
 REVERSE_PROXY_TRUSTED_PROXIES = *
 SECRET_KEY = {{ secret "secret_key" }}
 
+[admin]
+DISABLE_REGULAR_ORG_CREATION = {{ env "GITEA_DISABLE_REGULAR_ORG_CREATION" }}
+
 [oauth2]
 JWT_SECRET = {{ secret "jwt_secret" }}
 
@@ -84,5 +97,4 @@ IS_INPUT_FILE   = false
 MODE=console
 LEVEL=WARN
 STACKTRACE_LEVEL=None
-ENABLE_ACCESS_LOG=false
 ENABLE_XORM_LOG=false

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.21.11-1-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.7
+    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.5-rootless"
+    image: "gitea/gitea:1.22.0-rootless"
     configs:
       - source: app_ini
         target: /etc/gitea/app.ini
@@ -41,7 +41,17 @@ services:
       - GITEA_REPO_UPLOAD_MAX_SIZE
       - GITEA_REPO_UPLOAD_MAX_FILES
       - GITEA_REPO_INDEXER_ENABLED
+      - GITEA_ISSUE_INDEXER_TYPE
       - GITEA_STARTUP_TIMEOUT
+      - GITEA_SHOW_USER_EMAIL
+      - GITEA_DISABLE_REGULAR_ORG_CREATION
+      - GITEA_DEFAULT_KEEP_EMAIL_PRIVATE
+      - GITEA_DEFAULT_ALLOW_CREATE_ORGANIZATION
+      - GITEA_ENABLE_USER_HEATMAP
+      - GITEA_DEFAULT_USER_VISIBILITY
+      - GITEA_ALLOWED_USER_VISIBILITY_MODES
+      - GITEA_DEFAULT_ORG_VISIBILITY
+      - GITEA_REQUIRE_SIGNIN_VIEW
     volumes:
       - data:/var/lib/gitea
       - config:/etc/gitea
@@ -50,11 +60,18 @@ 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"
@@ -68,7 +85,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.5.2+1.21.5-rootless
+        - coop-cloud.${STACK_NAME}.version=2.9.1+1.22.0-rootless
 
 
 networks:

release/2.6.0+1.21.5-rootless

@@ -0,0 +1 @@
+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 🐛