Compare commits
6 Commits
6.8.2+v1.1
...
7.0.1+v1.1
| Author | SHA1 | Date | |
|---|---|---|---|
| 68fd515297 | |||
| 01e3feb1cf | |||
| c51120c41a | |||
| b81fecdd23 | |||
| 18b658c452 | |||
| 553fee0e9d |
2
abra.sh
2
abra.sh
@ -8,7 +8,7 @@ export TELEGRAM_BRIDGE_YAML_VERSION=v6
|
|||||||
export NGINX_CONFIG_VERSION=v12
|
export NGINX_CONFIG_VERSION=v12
|
||||||
export WK_SERVER_VERSION=v1
|
export WK_SERVER_VERSION=v1
|
||||||
export WK_CLIENT_VERSION=v1
|
export WK_CLIENT_VERSION=v1
|
||||||
export PG_BACKUP_VERSION=v1
|
export PG_BACKUP_VERSION=v2
|
||||||
export ADMIN_CONFIG_VERSION=v1
|
export ADMIN_CONFIG_VERSION=v1
|
||||||
|
|
||||||
set_admin () {
|
set_admin () {
|
||||||
|
|||||||
@ -3,13 +3,13 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
admin:
|
admin:
|
||||||
image: awesometechnologies/synapse-admin:0.11.1
|
image: awesometechnologies/synapse-admin:0.11.4
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.docker.network=proxy"
|
- "traefik.swarm.network=proxy"
|
||||||
- "traefik.http.services.${STACK_NAME}_admin.loadbalancer.server.port=80"
|
- "traefik.http.services.${STACK_NAME}_admin.loadbalancer.server.port=80"
|
||||||
- "traefik.http.routers.${STACK_NAME}_admin.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})&&PathPrefix(`/admin`)"
|
- "traefik.http.routers.${STACK_NAME}_admin.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})&&PathPrefix(`/admin`)"
|
||||||
- "traefik.http.routers.${STACK_NAME}_admin.entrypoints=web-secure"
|
- "traefik.http.routers.${STACK_NAME}_admin.entrypoints=web-secure"
|
||||||
|
|||||||
17
compose.yml
17
compose.yml
@ -3,7 +3,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
image: nginx:1.29.2
|
image: nginx:1.29.6
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
- internal
|
- internal
|
||||||
@ -22,7 +22,7 @@ services:
|
|||||||
target: /var/www/.well-known/matrix/client
|
target: /var/www/.well-known/matrix/client
|
||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: any
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
|
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
|
||||||
@ -33,11 +33,11 @@ services:
|
|||||||
test: curl -f http://${STACK_NAME}_app:8008/health || exit 1
|
test: curl -f http://${STACK_NAME}_app:8008/health || exit 1
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 15s
|
timeout: 15s
|
||||||
retries: 30
|
retries: 90
|
||||||
start_period: 1m
|
start_period: 2m
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: "matrixdotorg/synapse:v1.139.2"
|
image: "matrixdotorg/synapse:v1.149.1"
|
||||||
volumes:
|
volumes:
|
||||||
- "data:/data"
|
- "data:/data"
|
||||||
secrets:
|
secrets:
|
||||||
@ -106,7 +106,7 @@ services:
|
|||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
labels:
|
labels:
|
||||||
- "coop-cloud.${STACK_NAME}.version=6.8.2+v1.139.2"
|
- "coop-cloud.${STACK_NAME}.version=7.0.1+v1.149.1"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:8008/health"]
|
test: ["CMD", "curl", "-f", "http://localhost:8008/health"]
|
||||||
@ -116,21 +116,20 @@ services:
|
|||||||
start_period: 1m
|
start_period: 1m
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgres:13-alpine
|
image: pgautoupgrade/pgautoupgrade:17-alpine
|
||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
environment:
|
environment:
|
||||||
- LC_COLLATE=C
|
- LC_COLLATE=C
|
||||||
- LC_CTYPE=C
|
- LC_CTYPE=C
|
||||||
- POSTGRES_DB=synapse
|
- POSTGRES_DB=synapse
|
||||||
- POSTGRES_INITDB_ARGS="-E \"UTF8\""
|
- POSTGRES_INITDB_ARGS=-E UTF8
|
||||||
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
||||||
- POSTGRES_USER=synapse
|
- POSTGRES_USER=synapse
|
||||||
- DOMAIN
|
- DOMAIN
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "pg_isready", "-U", "synapse"]
|
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 20
|
retries: 20
|
||||||
|
|||||||
@ -6,7 +6,7 @@ BACKUP_FILE='/var/lib/postgresql/data/backup.sql'
|
|||||||
|
|
||||||
function backup {
|
function backup {
|
||||||
export PGPASSWORD=$(cat $POSTGRES_PASSWORD_FILE)
|
export PGPASSWORD=$(cat $POSTGRES_PASSWORD_FILE)
|
||||||
pg_dump -U ${POSTGRES_USER} ${POSTGRES_DB} > $BACKUP_FILE
|
pg_dump -U ${POSTGRES_USER} ${POSTGRES_DB} | gzip > $BACKUP_FILE
|
||||||
}
|
}
|
||||||
|
|
||||||
function restore {
|
function restore {
|
||||||
@ -25,7 +25,7 @@ function restore {
|
|||||||
# Recreate Database
|
# Recreate Database
|
||||||
psql -U ${POSTGRES_USER} -d postgres -c "DROP DATABASE ${POSTGRES_DB} WITH (FORCE);"
|
psql -U ${POSTGRES_USER} -d postgres -c "DROP DATABASE ${POSTGRES_DB} WITH (FORCE);"
|
||||||
createdb -U ${POSTGRES_USER} ${POSTGRES_DB}
|
createdb -U ${POSTGRES_USER} ${POSTGRES_DB}
|
||||||
psql -U ${POSTGRES_USER} -d ${POSTGRES_DB} -1 -f $BACKUP_FILE
|
gunzip -c $BACKUP_FILE | psql -U ${POSTGRES_USER} -d ${POSTGRES_DB} -1 -f -
|
||||||
|
|
||||||
trap - EXIT INT TERM
|
trap - EXIT INT TERM
|
||||||
restore_config
|
restore_config
|
||||||
|
|||||||
2
release/7.0.0+v1.149.1
Normal file
2
release/7.0.0+v1.149.1
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
WARNING: Backup your database!
|
||||||
|
This upgrade switches the database image from postgres to pgautoupgrade and performs an in-place database upgrades from version 13 to 17.
|
||||||
Reference in New Issue
Block a user