chore: publish 3.0.3+1.22.6-rootless release

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

.drone.yml

@@ -3,18 +3,22 @@ kind: pipeline
 name: deploy to swarm-test.autonomic.zone
 steps:
   - name: deployment
-    image: decentral1se/stack-ssh-deploy:latest
+    image: thecoopcloud/stack-ssh-deploy:latest
     settings:
       host: swarm-test.autonomic.zone
       stack: gitea
+      networks:
+       - proxy
       generate_secrets: true
       purge: true
       deploy_key:
         from_secret: drone_ssh_swarm_test
+      compose: "compose.yml:compose.mariadb.yml"
     environment:
+      APP_INI_VERSION: v1
+      DOCKER_SETUP_SH_VERSION: v1
+      PG_BACKUP_VERSION: v1
       DOMAIN: gitea.swarm-test.autonomic.zone
-      STACK_NAME: gitea
-      LETS_ENCRYPT_ENV: production
       GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION: true
       GITEA_APP_NAME: Git with solidaritea
       GITEA_AUTO_WATCH_NEW_REPOS: false
@@ -23,14 +27,31 @@ steps:
       GITEA_ENABLE_NOTIFY_MAIL: false
       GITEA_ENABLE_OPENID_SIGNIN: true
       GITEA_ENABLE_OPENID_SIGNUP: true
-      GITEA_SSH_PORT: 2222
       GITEA_SSH_ENABLED: 1
-      APP_INI_VERSION: v1
+      GITEA_SSH_PORT: 2222
+      LETS_ENCRYPT_ENV: production
       SECRET_DB_PASSWORD_VERSION: v1
       SECRET_DB_ROOT_PASSWORD_VERSION: v1
       SECRET_INTERNAL_TOKEN_VERSION: v1
       SECRET_JWT_SECRET_VERSION: v1
       SECRET_SECRET_KEY_VERSION: v1
+      STACK_NAME: gitea
 trigger:
   branch:
     - master
+---
+kind: pipeline
+name: generate recipe catalogue
+steps:
+  - name: release a new version
+    image: plugins/downstream
+    settings:
+      server: https://build.coopcloud.tech
+      token:
+        from_secret: drone_abra-bot_token
+      fork: true
+      repositories:
+        - coop-cloud/auto-recipes-catalogue-json
+
+trigger:
+  event: tag

.env.sample

@@ -2,6 +2,14 @@ TYPE=gitea
 
 DOMAIN=gitea.example.com
 LETS_ENCRYPT_ENV=production
+COMPOSE_FILE="compose.yml"
+ENABLE_BACKUPS=true
+COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
+# COMPOSE_FILE="$COMPOSE_FILE:compose.sqlite3.yml"
+# COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
+
+# Enable to use forgejo instead of gitea
+# COMPOSE_FILE="$COMPOSE_FILE:compose.forgejo.yml"
 
 GITEA_DOMAIN=git.example.com
 GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true
@@ -11,6 +19,25 @@ GITEA_DISABLE_REGISTRATION=false
 GITEA_ENABLE_NOTIFY_MAIL=true
 GITEA_ENABLE_OPENID_SIGNIN=true
 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_ENABLE_PUSH_CREATE_USER=false
+GITEA_ENABLE_PUSH_CREATE_ORG=false
+
+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
@@ -25,7 +52,22 @@ SECRET_JWT_SECRET_VERSION=v1 # length=43
 SECRET_SECRET_KEY_VERSION=v1 # length=64
 
 # SMTP Mailer
-# COMPOSE_FILE="compose.yml:compose.smtp.yml"
+# COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
 # GITEA_SMTP_MAILER_ENABLED=1
-# GITEA_MAILER_HOST=mail.gandi.net:465
+# GITEA_MAILER_ADDR=mail.gandi.net
+# GITEA_MAILER_PORT=465
 # SECRET_SMTP_PASSWORD_VERSION=v1
+# GITEA_MAILER_PROTOCOL=smtps
+
+# OATH2 Options
+# GITEA_REGISTER_EMAIL_CONFIRM=replace-me
+# GITEA_REGISTER_EMAIL_CONFIRM=replace-me
+# GITEA_OAUTH2_USERNAME=replace-me
+# 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

@@ -1,16 +1,16 @@
 # Gitea
 
-[![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/gitea/status.svg)](https://drone.autonomic.zone/coop-cloud/gitea)
+[![Build Status](https://build.coopcloud.tech/api/badges/coop-cloud/gitea/status.svg)](https://build.coopcloud.tech/coop-cloud/gitea)
 
 <!-- metadata -->
 * **Category**: Development
-* **Status**: ❷💛
-* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream
+* **Status**: 5
+* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), 4, upstream
 * **Healthcheck**: Yes
-* **Backups**: No
-* **Email**: ?
-* **Tests**: ❷💛
-* **SSO**: ❶💚 (OAuth)
+* **Backups**: Yes
+* **Email**: Yes
+* **Tests**: 2
+* **SSO**: 3 (OAuth)
 <!-- endmetadata -->
 
 ## Basic usage
@@ -19,6 +19,43 @@
 2. Deploy [`coop-cloud/traefik`][cc-traefik]
 3. `abra app new gitea --secrets` (optionally with `--pass` if you'd like
    to save secrets in `pass`)
-4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
+4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
    your Docker swarm box
-5. `abra app YOURAPPDOMAIN deploy`
+5. `abra app deploy YOURAPPDOMAIN`
+
+## Create first user
+
+Run
+
+```bash
+abra app run YOURAPPNAME app gitea -c /etc/gitea/app.ini admin user create --username USERNAME --admin --random-password --email EMAIL
+```
+
+See the [Gitea command-line documentation](https://docs.gitea.io/en-us/command-line/) for more options.  Make sure not to forget the `-c /etc/gitea/app.ini`.
+
+## Enable SSH
+
+You most certainly want to be able to access your repository over SSH.  To do so, make sure you uncomment the right lines in the configuration for `traefik`.
+```
+abra app config YOURTRAEFIKAPP
+```
+There uncomment or add these lines:
+```
+GITEA_SSH_ENABLED=1
+COMPOSE_FILE="compose.yml:compose.gitea.yml"
+```
+Then redeploy traefik:
+```
+abra app undeploy YOURTRAEFIKAPP
+abra app deploy YOURTRAEFIKAPP
+```
+You might need to wait a bit.  To check if it worked, you can run
+```
+telnet my.gitea.example.com 2222
+```
+Once you have added a public SSH key, you can check that you can connect to your gitea server with
+```
+ssh -T -p 2222 git@my.gitea.example.com
+```
+
+Note that gitea should be configured to listen to port 2222, i.e. `GITEA_SSH_PORT=2222` in the gitea config.

abra.sh

@@ -1 +1,15 @@
-export APP_INI_VERSION=v5
+export APP_INI_VERSION=v20
+export DOCKER_SETUP_SH_VERSION=v1
+export PG_BACKUP_VERSION=v1
+
+abra_backup_app() {
+  _abra_backup_dir "app:/var/lib/gitea"
+}
+
+abra_backup_db() {
+  _abra_backup_mysql "db" "gitea"
+}
+
+abra_backup() {
+  abra_backup_app && abra_backup_db
+}

app.ini.tmpl

@@ -2,16 +2,32 @@ APP_NAME = {{ env "GITEA_APP_NAME" }}
 
 [database]
 DB_TYPE = {{ env "GITEA_DB_TYPE" }}
+{{ if ne (env "GITEA_DB_TYPE") "sqlite3" }}
 HOST = {{ env "GITEA_DB_HOST" }}
 NAME = {{ env "GITEA_DB_NAME" }}
 PASSWD = {{ secret "db_password" }}
 USER = {{ env "GITEA_DB_USER" }}
+{{ else }}
+SQLITE_JOURNAL_MODE = {{ env "GITEA_SQLITE_JOURNAL_MODE" }}
+PATH = {{ env "GITEA_PATH" }}
+{{ end }}
+
+[picture]
+DISABLE_GRAVATAR = {{ env "GITEA_DISABLE_GRAVATAR" }}
+ENABLE_FEDERATED_AVATAR = {{ env "GITEA_ENABLE_FEDERATED_AVATAR" }}
 
 [service]
 ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ env "GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION" }}
 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" }}
@@ -19,15 +35,26 @@ ENABLE_OPENID_SIGNUP = {{ env "GITEA_ENABLE_OPENID_SIGNUP" }}
 
 [repository]
 DEFAULT_BRANCH = main
+ENABLE_PUSH_CREATE_USER = {{ env "GITEA_ENABLE_PUSH_CREATE_USER" }}
+ENABLE_PUSH_CREATE_ORG = {{ env "GITEA_ENABLE_PUSH_CREATE_ORG" }}
+
+[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" }}
+
+[ui]
+SHOW_USER_EMAIL = {{ env "GITEA_SHOW_USER_EMAIL" }}
 
 [indexer]
-STARTUP_TIMEOUT = 0
+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]
-APP_DATA_PATH = /data/gitea
 DOMAIN = {{ env "GITEA_DOMAIN" }}
-LANDING_PAGE = organizations
-LFS_CONTENT_PATH = /data/gitea/lfs
+LANDING_PAGE = {{ env "GITEA_LANDING_PAGE" }}
 ROOT_URL = https://%(DOMAIN)s/
 SSH_DOMAIN = {{ env "GITEA_DOMAIN" }}
 SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }}
@@ -37,8 +64,13 @@ START_SSH_SERVER = true
 [security]
 INSTALL_LOCK = true
 INTERNAL_TOKEN = {{ secret "internal_token" }}
+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" }}
 
@@ -46,11 +78,21 @@ JWT_SECRET = {{ secret "jwt_secret" }}
 [mailer]
 ENABLED        = true
 FROM           = {{ env "GITEA_MAILER_FROM" }}
-HOST           = {{ env "GITEA_MAILER_HOST" }}
+PROTOCOL       = {{ env "GITEA_MAILER_PROTOCOL" }}
+SMTP_ADDR      = {{ env "GITEA_MAILER_ADDR" }}
+SMTP_PORT      = {{ env "GITEA_MAILER_PORT" }}
 USER           = {{ env "GITEA_MAILER_USER" }}
 PASSWD         = {{ secret "smtp_password" }}
 MAILER_TYPE    = smtp
-IS_TLS_ENABLED = true
+{{ end }}
+
+{{ if eq (env "GITEA_OAUTH2_CLIENT_ENABLED") "1" }}
+[oauth2_client]
+REGISTER_EMAIL_CONFIRM = {{ env "GITEA_REGISTER_EMAIL_CONFIRM" }}
+ENABLE_AUTO_REGISTRATION = {{ env "GITEA_ENABLE_AUTO_REGISTRATION" }}
+USERNAME = {{ env "GITEA_OAUTH2_USERNAME" }}
+UPDATE_AVATAR = {{ env "GITEA_UPDATE_AVATAR" }}
+ACCOUNT_LINKING = {{ env "GITEA_ACCOUNT_LINKING" }}
 {{ end }}
 
 [markup.restructuredtext]
@@ -59,9 +101,8 @@ FILE_EXTENSIONS = .rst
 RENDER_COMMAND  = rst2html
 IS_INPUT_FILE   = false
 
-[picture]
-AVATAR_UPLOAD_PATH = /data/gitea/avatars
-REPOSITORY_AVATAR_UPLOAD_PATH = /data/gitea/repo-avatars
-
-[attachment]
-PATH = /data/gitea/attachments
+[log]
+MODE=console
+LEVEL=WARN
+STACKTRACE_LEVEL=None
+ENABLE_XORM_LOG=false

compose.forgejo.yml

@@ -0,0 +1,5 @@
+version: '3.8'
+
+services:
+  app:
+    image: codeberg.org/forgejo/forgejo:9.0.3-rootless

compose.mariadb.yml

@@ -0,0 +1,43 @@
+version: '3.8'
+
+services:
+  app:
+    environment:
+      - GITEA_DB_TYPE=mysql
+      - GITEA_DB_HOST="db:3306"
+      - GITEA_DB_NAME=gitea
+      - GITEA_DB_USER=gitea
+    secrets:
+      - db_password
+  db:
+    image: "mariadb:10.11.2"
+    deploy:
+      labels:
+          backupbot.backup.pre-hook: 'mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" gitea > /var/lib/mysql/backup.sql'
+          backupbot.backup.volumes.mariadb.path: "backup.sql"
+          backupbot.restore.post-hook: "mariadb -u root -p\"$$(cat /run/secrets/db_root_password)\" gitea < /var/lib/mysql/backup.sql"
+    command: |
+      mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+    environment:
+      - MYSQL_DATABASE=gitea
+      - MYSQL_USER=gitea
+      - MYSQL_PASSWORD_FILE=/run/secrets/db_password
+      - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
+    secrets:
+      - db_password
+      - db_root_password
+    volumes:
+      - "mariadb:/var/lib/mysql"
+    networks:
+      - internal
+
+secrets:
+  db_password:
+    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
+    external: true
+  db_root_password:
+    name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
+    external: true
+
+volumes:
+  mariadb:

compose.postgres.yml

@@ -0,0 +1,45 @@
+version: '3.8'
+
+services:
+  app:
+    environment:
+      - GITEA_DB_TYPE=postgres
+      - GITEA_DB_HOST="db:5432"
+      - GITEA_DB_NAME=gitea
+      - GITEA_DB_USER=gitea
+    secrets:
+      - db_password
+  db:
+    image: postgres:15.10
+    deploy:
+      labels:
+        backupbot.backup.pre-hook: "/pg_backup.sh backup"
+        backupbot.backup.volumes.db.path: "backup.sql"
+        backupbot.restore.post-hook: '/pg_backup.sh restore'
+    environment: 
+      - POSTGRES_DB=gitea
+      - POSTGRES_USER=gitea
+      - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
+    secrets:
+      - db_password
+    volumes:
+      - db:/var/lib/postgresql/data
+    networks:
+      - internal
+    configs:
+        - source: pg_backup
+          target: /pg_backup.sh
+          mode: 0555
+
+secrets:
+  db_password:
+    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
+    external: true
+
+volumes:
+  db:
+
+configs:
+  pg_backup:
+    name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
+    file: pg_backup.sh

compose.smtp.yml

@@ -1,13 +1,18 @@
+---
 version: "3.8"
+
 services:
   app:
     environment:
       - GITEA_MAILER_FROM
-      - GITEA_MAILER_HOST
+      - GITEA_MAILER_ADDR
+      - GITEA_MAILER_PORT
       - GITEA_MAILER_USER
+      - "GITEA_MAILER_PROTOCOL=${GITEA_MAILER_PROTOCOL:-smtps}"
     secrets:
       - smtp_password
+
 secrets:
-  smtp_passord:
+  smtp_password:
     name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
     external: true

compose.sqlite3.yml

@@ -0,0 +1,8 @@
+version: '3.8'
+
+services:
+  app:
+    environment:
+      - GITEA_DB_TYPE=sqlite3
+      - GITEA_SQLITE_JOURNAL_MODE=wal
+      - GITEA_PATH=/var/lib/gitea/gitea.db

compose.yml

@@ -1,12 +1,16 @@
+---
 version: "3.8"
+
 services:
   app:
-    image: "gitea/gitea:1.14.1-rootless"
+    image: "gitea/gitea:1.22.6-rootless"
     configs:
       - source: app_ini
         target: /etc/gitea/app.ini
+      - source: docker_setup_sh
+        target: /usr/local/bin/docker-setup.sh
+        mode: 0555
     secrets:
-      - db_password
       - internal_token
       - jwt_secret
       - secret_key
@@ -14,16 +18,39 @@ services:
       - GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION
       - GITEA_APP_NAME
       - GITEA_AUTO_WATCH_NEW_REPOS
-      - GITEA_DB_HOST="db:3306"
-      - GITEA_DB_NAME=gitea
-      - GITEA_DB_TYPE=mysql
-      - GITEA_DB_USER=gitea
       - GITEA_DISABLE_REGISTRATION
       - GITEA_DOMAIN=${DOMAIN}
       - GITEA_ENABLE_NOTIFY_MAIL
       - GITEA_ENABLE_OPENID_SIGNIN
       - GITEA_ENABLE_OPENID_SIGNUP
+      - GITEA_SMTP_MAILER_ENABLED
       - GITEA_SSH_PORT
+      - GITEA_DISABLE_GRAVATAR
+      - GITEA_ENABLE_FEDERATED_AVATAR
+      - GITEA_REGISTER_EMAIL_CONFIRM
+      - GITEA_ENABLE_AUTO_REGISTRATION
+      - GITEA_OAUTH2_USERNAME
+      - GITEA_UPDATE_AVATAR
+      - 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
+      - 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
@@ -33,16 +60,17 @@ services:
       - proxy
       - internal
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:3000"]
-      interval: 15s
+      test: ["CMD", "curl", "-f", "http://localhost:3000/api/healthz"]
+      interval: 30s
       timeout: 10s
       retries: 10
-      start_period: 30s
+      start_period: 1m
     deploy:
       update_config:
         failure_action: rollback
         order: start-first
       labels:
+        - "backupbot.backup=${ENABLE_BACKUPS:-true}"
         - "traefik.enable=true"
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
@@ -51,41 +79,30 @@ services:
         - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)"
         - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh"
         - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}"
-        - coop-cloud.${STACK_NAME}.app.version=1.14.0-327bfb3f
-  db:
-    image: "mariadb:10.5"
-    command: |
-      mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
-    environment:
-      - MYSQL_DATABASE=gitea
-      - MYSQL_USER=gitea
-      - MYSQL_PASSWORD_FILE=/run/secrets/db_password
-      - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
-    secrets:
-      - db_password
-      - db_root_password
-    volumes:
-      - "mariadb:/var/lib/mysql"
-    networks:
-      - internal
-    deploy:
-      labels: ["coop-cloud.${STACK_NAME}.db.version=10.5-9c681cef"]
+        - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}_cors"
+        - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolallowmethods=GET,OPTIONS,PUT"
+        - "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=3.0.3+1.22.6-rootless
+
+
 networks:
   internal:
   proxy:
     external: true
+
 configs:
   app_ini:
     name: ${STACK_NAME}_app_ini_${APP_INI_VERSION}
     file: app.ini.tmpl
     template_driver: golang
+  docker_setup_sh:
+    name: ${STACK_NAME}_docker_setup_sh_${DOCKER_SETUP_SH_VERSION}
+    file: docker-setup.sh.tmpl
+    template_driver: golang
+
 secrets:
-  db_password:
-    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
-    external: true
-  db_root_password:
-    name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
-    external: true
   internal_token:
     name: ${STACK_NAME}_internal_token_${SECRET_INTERNAL_TOKEN_VERSION}
     external: true
@@ -95,7 +112,7 @@ secrets:
   secret_key:
     name: ${STACK_NAME}_secret_key_${SECRET_SECRET_KEY_VERSION}
     external: true
+
 volumes:
   data:
   config:
-  mariadb:

docker-setup.sh.tmpl

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# modified version of https://github.com/go-gitea/gitea/blob/d7dbe4feebac7805a4ca184f0989f58de8063d96/docker/rootless/usr/local/bin/docker-setup.sh
+# also see https://github.com/go-gitea/gitea/pull/14762#issuecomment-829224656
+
+# Prepare git folder
+mkdir -p ${HOME} && chmod 0700 ${HOME}
+if [ ! -w ${HOME} ]; then echo "${HOME} is not writable"; exit 1; fi
+
+# Prepare custom folder
+mkdir -p ${GITEA_CUSTOM} && chmod 0500 ${GITEA_CUSTOM}
+
+# Prepare temp folder
+mkdir -p ${GITEA_TEMP} && chmod 0700 ${GITEA_TEMP}
+if [ ! -w ${GITEA_TEMP} ]; then echo "${GITEA_TEMP} is not writable"; exit 1; fi

pg_backup.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e
+
+BACKUP_FILE='/var/lib/postgresql/data/backup.sql'
+
+function backup {
+  export PGPASSWORD=$(cat $POSTGRES_PASSWORD_FILE)
+  pg_dump -U ${POSTGRES_USER} ${POSTGRES_DB} > $BACKUP_FILE
+}
+
+function restore {
+    cd /var/lib/postgresql/data/
+    restore_config(){
+        # Restore allowed connections
+        cat pg_hba.conf.bak > pg_hba.conf
+        su postgres -c 'pg_ctl reload'
+    }
+    # Don't allow any other connections than local
+    cp pg_hba.conf pg_hba.conf.bak
+    echo "local all all trust" > pg_hba.conf
+    su postgres -c 'pg_ctl reload'
+    trap restore_config EXIT INT TERM
+
+    # Recreate Database
+    psql -U ${POSTGRES_USER} -d postgres -c "DROP DATABASE ${POSTGRES_DB} WITH (FORCE);" 
+    createdb -U ${POSTGRES_USER} ${POSTGRES_DB}
+    psql -U ${POSTGRES_USER} -d ${POSTGRES_DB} -1 -f $BACKUP_FILE
+
+    trap - EXIT INT TERM
+    restore_config
+}
+
+$@

release/2.0.0+1.18.0-rootless

@@ -0,0 +1,8 @@
+This release adds the possibility to run gitea with postgres.
+Please add the following lines to your servers .env file!
+
+```
+COMPOSE_FILE="compose.yml"
+COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
+# COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
+```

release/2.1.2+1.19.3-rootless

@@ -0,0 +1,2 @@
+Beware that you'll also be updating Postgres if you're running it. Usually with major updates it might involve pg_dumpall / pg_restore either side of the upgrade because the server app doesn't know how to upgrade data storage formats, won't launch if it detects an old data format, a pg_upgrade command is available. More info on https://git.coopcloud.tech/coop-cloud/gitea/pulls/31
+

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 🐛

release/3.0.0+1.22.2-rootless

@@ -0,0 +1,3 @@
+BEWARE! 🚨 This release updates to the newer Gitea SMTP settings format.
+
+If you are using SMTP, you will need to split the old GITEA_MAILER_HOST into separate GITEA_MAILER_ADDR (hostname) and GITEA_MAILER_PORT settings.

renovate.json

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