Merge branch 'renovate/codeberg.org-forgejo-forgejo-14.x' into sutty

.env.sample

@@ -56,18 +56,6 @@ SECRET_DB_ROOT_PASSWORD_VERSION=v1
 SECRET_JWT_SECRET_VERSION=v1 # length=43
 SECRET_SECRET_KEY_VERSION=v1 # length=64
 
-# Change to "minio" an configure to enable S3 storage
-# https://forgejo.org/docs/latest/admin/setup/storage/
-GITEA_STORAGE_TYPE=local
-# MINIO_ENDPOINT=
-# MINIO_ACCESS_KEY_ID=
-# SECRET_MINIO_SECRET_ACCESS_KEY_VERSION=v1
-# MINIO_BUCKET=
-# MINIO_BUCKET_LOOKUP=auto
-# MINIO_LOCATION=garage
-# MINIO_CHECKSUM_ALGORITHM=default
-# COMPOSE_FILE="$COMPOSE_FILE:compose.s3.yml"
-
 # SMTP Mailer
 # COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
 # GITEA_SMTP_MAILER_ENABLED=1

app.ini.tmpl

@@ -16,21 +16,6 @@ PATH = {{ env "GITEA_PATH" }}
 DISABLE_GRAVATAR = {{ env "GITEA_DISABLE_GRAVATAR" }}
 ENABLE_FEDERATED_AVATAR = {{ env "GITEA_ENABLE_FEDERATED_AVATAR" }}
 
-[storage]
-STORAGE_TYPE = {{ env "GITEA_STORAGE_TYPE" }}
-{{ if eq (env "GITEA_STORAGE_TYPE") "minio" }}
-SERVE_DIRECT = false
-MINIO_ENDPOINT = {{ env "MINIO_ENDPOINT" }}
-MINIO_ACCESS_KEY_ID = {{ env "MINIO_ACCESS_KEY_ID" }}
-MINIO_SECRET_ACCESS_KEY = {{ secret "minio_secret_access_key" }}
-MINIO_BUCKET = {{ env "MINIO_BUCKET" }}
-MINIO_BUCKET_LOOKUP = {{ env "MINIO_BUCKET_LOOKUP" }}
-MINIO_LOCATION = {{ env "MINIO_LOCATION" }}
-MINIO_USE_SSL = true
-MINIO_INSECURE_SKIP_VERIFY = false
-MINIO_CHECKSUM_ALGORITHM = {{ env "MINIO_CHECKSUM_ALGORITHM" }}
-{{ end }}
-
 [service]
 ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ env "GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION" }}
 ALLOW_ONLY_INTERNAL_REGISTRATION = {{ env "GITEA_ALLOW_ONLY_INTERNAL_REGISTRATION" }}

compose.s3.yml

@@ -1,10 +0,0 @@
----
-version: "3.8"
-services:
-  app:
-    secrets:
-      - minio_secret_access_key
-secrets:
-  minio_secret_access_key:
-    name: ${STACK_NAME}_minio_secret_access_key_${SECRET_MINIO_SECRET_ACCESS_KEY_VERSION}
-    external: true

compose.yml

@@ -3,10 +3,10 @@ version: "3.8"
 
 services:
   app:
-    image: codeberg.org/forgejo/forgejo:15.0.2-rootless
+    image: codeberg.org/forgejo/forgejo:14.0.1-rootless
     configs:
       - source: app_ini
-        target: /var/lib/gitea/custom/conf/app.ini
+        target: /etc/gitea/app.ini
       - source: docker_setup_sh
         target: /usr/local/bin/docker-setup.sh
         mode: 0555
@@ -59,6 +59,7 @@ services:
       - GITEA_MAX_CREATION_LIMIT=${GITEA_MAX_CREATION_LIMIT:--1}
     volumes:
       - data:/var/lib/gitea
+      - config:/etc/gitea
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     networks:
@@ -73,7 +74,7 @@ services:
     deploy:
       update_config:
         failure_action: rollback
-        order: stop-first
+        order: start-first
       labels:
         - "backupbot.backup=${ENABLE_BACKUPS:-true}"
         - "traefik.enable=true"
@@ -90,7 +91,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=5.3.1+15.0.2-rootless
+        - coop-cloud.${STACK_NAME}.version=5.0.3+13.0.4-rootless
 
 
 networks:
@@ -124,3 +125,4 @@ secrets:
 
 volumes:
   data:
+  config:

release/5.1.0+14.0.1-rootless

@@ -1 +0,0 @@
-https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/14.0.0.md https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/14.0.1.md

renovate.json

@@ -4,7 +4,6 @@
     "config:recommended"
   ],
   "reviewers": [
-    "fauno",
-    "p4u1"
+    "team:forgejo-maintainers"
   ]
 }