Compare commits

..
Author SHA1 Message Date
autonomic-bot a5ce46f2a3 fix: bump APP_INI_VERSION to v23 (app.ini.tmpl changed in the forgejo removal)
cc-ci/testme cc-ci: success
Docker Swarm configs are IMMUTABLE — only labels can be updated. The config is
named ${STACK_NAME}_app_ini_${APP_INI_VERSION}, so when app.ini.tmpl's rendered
content changes the version suffix MUST be bumped, otherwise abra tries to mutate
the existing object and the deploy aborts:

  FATA failed to update config <stack>_app_ini_v22: Error response from daemon:
  rpc error: code = InvalidArgument desc = only updates to Labels are allowed

'BREAKING CHANGE: remove forgejo' (6a0339d) edited app.ini.tmpl —

  -{{ if or (eq (env "FORGE") "forgejo") (eq (env "GITEA_LFS_START_SERVER") "true") }}
  +{{ if (eq (env "GITEA_LFS_START_SERVER") "true") }}

— but left APP_INI_VERSION at v22 (unchanged since the LFS commit 357926f), and
3.6.2+1.27.1-rootless shipped that way. Every existing deployment upgrading ACROSS
the forgejo removal therefore fails at 'initialising deployment'; reproduced on a
live 3.6.1+1.26.2-rootless -> 3.6.2+1.27.1-rootless upgrade.

Bumping to v23 makes Swarm create a NEW config object instead of mutating v22. The
orphaned v22 object can be pruned after the rollout. Only app.ini.tmpl changed, so
DOCKER_SETUP_SH_VERSION and PG_BACKUP_VERSION stay put.

Note: cc-ci's upgrade tier did not catch this because it resolved the upgrade base
to main-tip, which ALREADY contains the forgejo removal — base and head then render
identical app.ini and no config update is attempted. Real deployments upgrade from
the last published RELEASE (3.6.1+1.26.2), which is where the break appears.
2026-08-10 16:48:35 +00:00
6 changed files with 6 additions and 16 deletions
+1 -4
View File
@@ -13,9 +13,7 @@ COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
# COMPOSE_FILE="$COMPOSE_FILE:compose.lfs.yml" # COMPOSE_FILE="$COMPOSE_FILE:compose.lfs.yml"
# SECRET_LFS_JWT_SECRET_VERSION=v1 # length=43 # SECRET_LFS_JWT_SECRET_VERSION=v1 # length=43
# Anubis GITEA_DOMAIN=git.example.com
# COMPOSE_FILE="$COMPOSE_FILE:compose.anubis.yml"
GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true
GITEA_APP_NAME="Git with solidaritea" GITEA_APP_NAME="Git with solidaritea"
GITEA_AUTO_WATCH_NEW_REPOS=false GITEA_AUTO_WATCH_NEW_REPOS=false
@@ -81,4 +79,3 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
# GITEA_REPO_INDEXER_ENABLED=false # GITEA_REPO_INDEXER_ENABLED=false
# GITEA_ISSUE_INDEXER_TYPE=db # GITEA_ISSUE_INDEXER_TYPE=db
# GITEA_STARTUP_TIMEOUT=-1 # GITEA_STARTUP_TIMEOUT=-1
+1 -1
View File
@@ -5,7 +5,7 @@
<!-- metadata --> <!-- metadata -->
* **Category**: Development * **Category**: Development
* **Status**: 5 * **Status**: 5
* **Image**: [`gitea/gitea`](https://hub.docker.com/r/gitea/gitea), 4, upstream * **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), 4, upstream
* **Healthcheck**: Yes * **Healthcheck**: Yes
* **Backups**: Yes * **Backups**: Yes
* **Email**: Yes * **Email**: Yes
-7
View File
@@ -1,7 +0,0 @@
---
version: "3.8"
services:
app:
deploy:
labels:
- "traefik.http.routers.${STACK_NAME}.middlewares=anubis,${STACK_NAME}_cors"
+1 -1
View File
@@ -10,7 +10,7 @@ services:
secrets: secrets:
- db_password - db_password
db: db:
image: "mariadb:10.11.19" image: "mariadb:10.11.2"
deploy: deploy:
labels: 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.pre-hook: 'mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" gitea > /var/lib/mysql/backup.sql'
+1 -1
View File
@@ -10,7 +10,7 @@ services:
secrets: secrets:
- db_password - db_password
db: db:
image: postgres:15.19 image: postgres:15.18
deploy: deploy:
labels: labels:
backupbot.backup.pre-hook: "/pg_backup.sh backup" backupbot.backup.pre-hook: "/pg_backup.sh backup"
+2 -2
View File
@@ -3,7 +3,7 @@ version: "3.8"
services: services:
app: app:
image: "gitea/gitea:1.27.3-rootless" image: "gitea/gitea:1.27.1-rootless"
configs: configs:
- source: app_ini - source: app_ini
target: /etc/gitea/app.ini target: /etc/gitea/app.ini
@@ -87,7 +87,7 @@ services:
- "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "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.accesscontrolmaxage=100"
- "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true"
- coop-cloud.${STACK_NAME}.version=3.6.5+1.27.3-rootless - coop-cloud.${STACK_NAME}.version=3.6.2+1.27.1-rootless
networks: networks: