chore(deps): update postgres docker tag to v15.18

.env.sample

@@ -38,10 +38,6 @@ GITEA_ENABLE_PUSH_CREATE_USER=false
 GITEA_ENABLE_PUSH_CREATE_ORG=false
 GITEA_LFS_START_SERVER=false
 GITEA_MAX_CREATION_LIMIT=-1
-GITEA_SESSION_PROVIDER=db
-GITEA_CACHE_ADAPTER=memory
-GITEA_CACHE_HOST=
-GITEA_CACHE_ITEM_TTL=16h
 
 GITEA_REPO_UPLOAD_ENABLED=true
 GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/*
@@ -97,10 +93,3 @@ GITEA_STORAGE_TYPE=local
 # GITEA_REPO_INDEXER_ENABLED=false
 # GITEA_ISSUE_INDEXER_TYPE=db
 # GITEA_STARTUP_TIMEOUT=-1
-
-# Prometheus metrics
-# FORGEJO_METRICS_ENABLED=false
-# FORGEJO_METRICS_ENABLED_ISSUE_BY_LABEL=false
-# FORGEJO_METRICS_ENABLED_ISSUE_BY_REPOSITORY=false
-# SECRET_FORGEJO_METRICS_TOKEN_VERSION=v1
-# COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml"

abra.sh

@@ -1,4 +1,4 @@
-export APP_INI_VERSION=v27
+export APP_INI_VERSION=v25
 export DOCKER_SETUP_SH_VERSION=v1
 export PG_BACKUP_VERSION=v1
 

app.ini.tmpl

@@ -126,19 +126,3 @@ MODE=console
 LEVEL=WARN
 STACKTRACE_LEVEL=None
 ENABLE_XORM_LOG=false
-
-[session]
-PROVIDER = {{ env "GITEA_SESSION_PROVIDER" }}
-
-[cache]
-ADAPTER = {{ env "GITEA_CACHE_ADAPTER" }}
-HOST = {{ env "GITEA_CACHE_HOST" }}
-ITEM_TTL = {{ env "GITEA_CACHE_ITEM_TTL" }}
-
-{{ if eq (env "FORGEJO_METRICS_ENABLED") "true" }}
-[metrics]
-ENABLED = {{ env "FORGEJO_METRICS_ENABLED" }}
-ENABLED_ISSUE_BY_LABEL = {{ env "FORGEJO_METRICS_ENABLED_ISSUE_BY_LABEL" }}
-ENABLED_ISSUE_BY_REPOSITORY = {{ env "FORGEJO_METRICS_ENABLED_ISSUE_BY_REPOSITORY" }}
-TOKEN = {{ secret "metrics_token" }}
-{{ end }}

compose.metrics.yml

@@ -1,10 +0,0 @@
----
-version: "3.8"
-services:
-  app:
-    secrets:
-      - metrics_token
-secrets:
-  metrics_token:
-    name: ${STACK_NAME}_metrics_token_${SECRET_FORGEJO_METRICS_TOKEN_VERSION}
-    external: true

compose.postgres.yml

@@ -10,7 +10,7 @@ services:
     secrets:
       - db_password
   db:
-    image: postgres:15.13
+    image: postgres:15.18
     deploy:
       labels:
         backupbot.backup.pre-hook: "/pg_backup.sh backup"

compose.yml

@@ -73,7 +73,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 +90,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.4.0+15.0.2-rootless
+        - coop-cloud.${STACK_NAME}.version=5.3.1+15.0.2-rootless
 
 
 networks:

release/5.4.0+15.0.2-rootless

@@ -1 +0,0 @@
-New enviromental variables have been added! Please update your .env before deploying.