From 667371c1e1292669b049aaafc713898eca0c10d6 Mon Sep 17 00:00:00 2001 From: Pierre 'McFly' Marty Date: Thu, 25 Sep 2025 18:44:21 +0200 Subject: [PATCH 1/2] chore(docker): fixes synapse version to 1.119.0 Signed-off-by: Pierre 'McFly' Marty --- .../examples/tom+fed+chat+admin.pgsql+ldap.yml | 2 +- .compose/examples/tom+fed+chat+admin.sqlite.yml | 2 +- .compose/examples/tom+fed+chat.pgsql+ldap.yml | 2 +- .compose/examples/tom+fed+chat.sqlite.yml | 2 +- docker-compose.yml | 2 +- .../src/__testData__/docker-compose.yml | 16 ++++++++-------- .../matrix-server/docker-compose.yml | 2 +- .../matrix-identity-server/matrix-server/init | 2 +- .../__testData__/docker-compose.yml | 2 +- .../__testData__/docker-compose.yml | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.compose/examples/tom+fed+chat+admin.pgsql+ldap.yml b/.compose/examples/tom+fed+chat+admin.pgsql+ldap.yml index 3a453e4d..8293c060 100644 --- a/.compose/examples/tom+fed+chat+admin.pgsql+ldap.yml +++ b/.compose/examples/tom+fed+chat+admin.pgsql+ldap.yml @@ -66,7 +66,7 @@ services: db: synapse: - image: matrixdotorg/synapse + image: matrixdotorg/synapse:v1.119.0 restart: unless-stopped env_file: - path: ../.env diff --git a/.compose/examples/tom+fed+chat+admin.sqlite.yml b/.compose/examples/tom+fed+chat+admin.sqlite.yml index 917d597f..99060f7f 100644 --- a/.compose/examples/tom+fed+chat+admin.sqlite.yml +++ b/.compose/examples/tom+fed+chat+admin.sqlite.yml @@ -26,7 +26,7 @@ services: - auth synapse: - image: matrixdotorg/synapse + image: matrixdotorg/synapse:v1.119.0 restart: unless-stopped env_file: - path: ../.env diff --git a/.compose/examples/tom+fed+chat.pgsql+ldap.yml b/.compose/examples/tom+fed+chat.pgsql+ldap.yml index e39fecc5..27df8938 100644 --- a/.compose/examples/tom+fed+chat.pgsql+ldap.yml +++ b/.compose/examples/tom+fed+chat.pgsql+ldap.yml @@ -66,7 +66,7 @@ services: db: synapse: - image: matrixdotorg/synapse + image: matrixdotorg/synapse:v1.119.0 restart: unless-stopped env_file: - path: ../.env diff --git a/.compose/examples/tom+fed+chat.sqlite.yml b/.compose/examples/tom+fed+chat.sqlite.yml index 0e44b4cd..1ed08878 100644 --- a/.compose/examples/tom+fed+chat.sqlite.yml +++ b/.compose/examples/tom+fed+chat.sqlite.yml @@ -26,7 +26,7 @@ services: - auth synapse: - image: matrixdotorg/synapse + image: matrixdotorg/synapse:v1.119.0 restart: unless-stopped env_file: - path: ../.env diff --git a/docker-compose.yml b/docker-compose.yml index a3b2fc7d..a86f871b 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: - auth synapse: - image: matrixdotorg/synapse + image: matrixdotorg/synapse:v1.119.0 restart: unless-stopped env_file: - path: ./.compose/.env diff --git a/packages/federated-identity-service/src/__testData__/docker-compose.yml b/packages/federated-identity-service/src/__testData__/docker-compose.yml index db9dd28e..ce372558 100644 --- a/packages/federated-identity-service/src/__testData__/docker-compose.yml +++ b/packages/federated-identity-service/src/__testData__/docker-compose.yml @@ -23,7 +23,7 @@ services: - test synapse-federated-identity-service: &synapse_template - image: matrixdotorg/synapse:v1.89.0 + image: matrixdotorg/synapse:v1.119.0 container_name: synapse-federated-identity-service volumes: - ./synapse-data:/data @@ -31,7 +31,7 @@ services: - ./nginx/ssl/9da13359.0:/etc/ssl/certs/9da13359.0 depends_on: - auth - environment: + environment: - UID=${MYUID} - VIRTUAL_PORT=8008 - VIRTUAL_HOST=matrix.example.com @@ -47,7 +47,7 @@ services: synapse-1: <<: *synapse_template container_name: synapse-1 - environment: + environment: - UID=${MYUID} - VIRTUAL_PORT=8008 - VIRTUAL_HOST=matrix1.example.com @@ -56,7 +56,7 @@ services: synapse-2: <<: *synapse_template container_name: synapse-2 - environment: + environment: - UID=${MYUID} - VIRTUAL_PORT=8008 - VIRTUAL_HOST=matrix2.example.com @@ -65,7 +65,7 @@ services: synapse-3: <<: *synapse_template container_name: synapse-3 - environment: + environment: - UID=${MYUID} - VIRTUAL_PORT=8008 - VIRTUAL_HOST=matrix3.example.com @@ -157,11 +157,11 @@ services: volumes: - ./nginx/ssl/ca.pem:/etc/ssl/certs/ca.pem - ./identity-server/conf/identity-server-2.conf:/etc/twake/identity-server.conf - environment: + environment: - NODE_EXTRA_CA_CERTS=/etc/ssl/certs/ca.pem - VIRTUAL_PORT=3000 - VIRTUAL_HOST=identity2.example.com - + identity-server-3: <<: *identity-server-template container_name: identity-server-3 @@ -200,4 +200,4 @@ services: networks: test: - name: test \ No newline at end of file + name: test diff --git a/packages/matrix-identity-server/matrix-server/docker-compose.yml b/packages/matrix-identity-server/matrix-server/docker-compose.yml index d9d2500e..58f445bb 100644 --- a/packages/matrix-identity-server/matrix-server/docker-compose.yml +++ b/packages/matrix-identity-server/matrix-server/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.4' services: synapse: - image: matrixdotorg/synapse:latest + image: matrixdotorg/synapse:v1.119.0 container_name: synapse hostname: matrix.example.com volumes: diff --git a/packages/matrix-identity-server/matrix-server/init b/packages/matrix-identity-server/matrix-server/init index 218e36b2..7c7a1616 100755 --- a/packages/matrix-identity-server/matrix-server/init +++ b/packages/matrix-identity-server/matrix-server/init @@ -13,7 +13,7 @@ docker run -it --rm \ -e SYNAPSE_REPORT_STATS=no \ -e UID=$MYUID \ -e GID=$MYGID \ - matrixdotorg/synapse:latest generate + matrixdotorg/synapse:v1.119.0 generate chmod 644 synapse-data/example.com.signing.key mkdir -p synapse-data/media_store diff --git a/packages/tom-server/src/application-server/__testData__/docker-compose.yml b/packages/tom-server/src/application-server/__testData__/docker-compose.yml index 3ae93417..e5187393 100644 --- a/packages/tom-server/src/application-server/__testData__/docker-compose.yml +++ b/packages/tom-server/src/application-server/__testData__/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.8' services: synapse: - image: matrixdotorg/synapse:v1.89.0 + image: matrixdotorg/synapse:v1.119.0 container_name: synapse-tom-1 volumes: - ./synapse-data:/data diff --git a/packages/tom-server/src/search-engine-api/__testData__/docker-compose.yml b/packages/tom-server/src/search-engine-api/__testData__/docker-compose.yml index ae10d0a2..73a169f6 100644 --- a/packages/tom-server/src/search-engine-api/__testData__/docker-compose.yml +++ b/packages/tom-server/src/search-engine-api/__testData__/docker-compose.yml @@ -26,7 +26,7 @@ services: - twake_chat synapse: - image: matrixdotorg/synapse:v1.89.0 + image: matrixdotorg/synapse:v1.119.0 container_name: synapse-tom volumes: - ./synapse-data:/data From 8165bf3fe97d46a7fd01810dc9f6714c7e2e21eb Mon Sep 17 00:00:00 2001 From: Pierre 'McFly' Marty Date: Fri, 31 Oct 2025 10:20:39 +0100 Subject: [PATCH 2/2] chore: removes version in docker compose files Signed-off-by: Pierre 'McFly' Marty --- .../src/__testData__/docker-compose.yml | 4 +--- .../matrix-server/docker-compose.yml | 2 -- packages/matrix-invite/docker-compose.yml | 2 -- .../application-server/__testData__/docker-compose.yml | 8 +++----- .../src/search-engine-api/__testData__/docker-compose.yml | 8 +++----- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/packages/federated-identity-service/src/__testData__/docker-compose.yml b/packages/federated-identity-service/src/__testData__/docker-compose.yml index ce372558..97f8d0dd 100644 --- a/packages/federated-identity-service/src/__testData__/docker-compose.yml +++ b/packages/federated-identity-service/src/__testData__/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: postgresql: image: postgres:13-bullseye @@ -13,7 +11,7 @@ services: environment: - POSTGRES_PASSWORD=synapse!! healthcheck: - test: ['CMD-SHELL', 'pg_isready'] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 diff --git a/packages/matrix-identity-server/matrix-server/docker-compose.yml b/packages/matrix-identity-server/matrix-server/docker-compose.yml index 58f445bb..47215155 100644 --- a/packages/matrix-identity-server/matrix-server/docker-compose.yml +++ b/packages/matrix-identity-server/matrix-server/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.4' - services: synapse: image: matrixdotorg/synapse:v1.119.0 diff --git a/packages/matrix-invite/docker-compose.yml b/packages/matrix-invite/docker-compose.yml index 85700a4b..57407b3c 100644 --- a/packages/matrix-invite/docker-compose.yml +++ b/packages/matrix-invite/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.9" - services: invitation: container_name: invitation diff --git a/packages/tom-server/src/application-server/__testData__/docker-compose.yml b/packages/tom-server/src/application-server/__testData__/docker-compose.yml index e5187393..bb1e381d 100644 --- a/packages/tom-server/src/application-server/__testData__/docker-compose.yml +++ b/packages/tom-server/src/application-server/__testData__/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: synapse: image: matrixdotorg/synapse:v1.119.0 @@ -14,12 +12,12 @@ services: - VIRTUAL_PORT=8008 - VIRTUAL_HOST=matrix.example.com healthcheck: - test: ['CMD', 'curl', '-fSs', 'http://localhost:8008/health'] + test: ["CMD", "curl", "-fSs", "http://localhost:8008/health"] interval: 10s timeout: 10s retries: 3 extra_hosts: - - 'host.docker.internal:host-gateway' + - "host.docker.internal:host-gateway" auth: image: yadd/lemonldap-ng-portal:2.18.2-9 @@ -33,7 +31,7 @@ services: - PORTAL=https://auth.example.com - VIRTUAL_HOST=auth.example.com extra_hosts: - - 'host.docker.internal:host-gateway' + - "host.docker.internal:host-gateway" nginx-proxy: image: nginxproxy/nginx-proxy diff --git a/packages/tom-server/src/search-engine-api/__testData__/docker-compose.yml b/packages/tom-server/src/search-engine-api/__testData__/docker-compose.yml index 73a169f6..545e9e88 100644 --- a/packages/tom-server/src/search-engine-api/__testData__/docker-compose.yml +++ b/packages/tom-server/src/search-engine-api/__testData__/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - networks: twake_chat: @@ -16,7 +14,7 @@ services: environment: - POSTGRES_PASSWORD=synapse!! healthcheck: - test: ['CMD-SHELL', 'pg_isready'] + test: ["CMD-SHELL", "pg_isready"] interval: 10s timeout: 5s retries: 5 @@ -39,14 +37,14 @@ services: - VIRTUAL_PORT=8008 - VIRTUAL_HOST=matrix.example.com healthcheck: - test: ['CMD', 'curl', '-fSs', 'http://localhost:8008/health'] + test: ["CMD", "curl", "-fSs", "http://localhost:8008/health"] interval: 10s timeout: 10s retries: 3 networks: - twake_chat extra_hosts: - - 'host.docker.internal:host-gateway' + - "host.docker.internal:host-gateway" auth: image: yadd/lemonldap-ng-portal:2.16.1-bullseye