diff --git a/abra.sh b/abra.sh index 68fe314..c412518 100644 --- a/abra.sh +++ b/abra.sh @@ -1,5 +1,5 @@ export APP_INI_VERSION=v23 -export DOCKER_SETUP_SH_VERSION=v1 +export DOCKER_SETUP_SH_VERSION=v3 export PG_BACKUP_VERSION=v1 abra_backup_app() { diff --git a/compose.yml b/compose.yml index aa26f5f..f133459 100644 --- a/compose.yml +++ b/compose.yml @@ -6,7 +6,7 @@ services: image: "gitea/gitea:28.2.0-rootless" configs: - source: app_ini - target: /etc/gitea/app.ini + target: /etc/gitea/app.ini.init - source: docker_setup_sh target: /usr/local/bin/docker-setup.sh mode: 0555 @@ -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.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=3.6.10+28.2.0-rootless + - coop-cloud.${STACK_NAME}.version=3.6.11+28.2.0-rootless networks: diff --git a/docker-setup.sh.tmpl b/docker-setup.sh.tmpl index 310e8f7..af5f5c8 100644 --- a/docker-setup.sh.tmpl +++ b/docker-setup.sh.tmpl @@ -13,3 +13,11 @@ 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 + +# Gitea writes settings such as WORK_PATH back to app.ini on boot. The Swarm +# config is read-only, so seed a writable copy on the persistent config volume. +# Old direct-mount deployments may leave an empty app.ini behind. +if [ ! -s /etc/gitea/app.ini ]; then + cp /etc/gitea/app.ini.init /etc/gitea/app.ini +fi +chmod 0600 /etc/gitea/app.ini 2>/dev/null || true