This commit is contained in:
2026-08-02 13:31:05 +02:00
parent da4f72dff4
commit 49ba7afb98
2 changed files with 21 additions and 12 deletions
+3 -3
View File
@@ -1,6 +1,6 @@
services: services:
prosody: prosody:
image: prosody/xmpp:latest image: prosody
restart: unless-stopped restart: unless-stopped
ports: ports:
- "5000:5000" - "5000:5000"
@@ -17,7 +17,7 @@ services:
- ./certs:/usr/local/etc/prosody/certs - ./certs:/usr/local/etc/prosody/certs
prosody_postgres: prosody_postgres:
image: prosody/xmpp:latest image: prosody
restart: unless-stopped restart: unless-stopped
ports: ports:
- "5000:5000" - "5000:5000"
@@ -51,7 +51,7 @@ services:
POSTGRES_PASSWORD: prosody POSTGRES_PASSWORD: prosody
prosody_ldap: prosody_ldap:
image: prosody/xmpp:latest image: prosody
restart: unless-stopped restart: unless-stopped
ports: ports:
- "5000:5000" - "5000:5000"
+18 -9
View File
@@ -20,7 +20,6 @@ registerTestUser() {
local containerName="$2" local containerName="$2"
echo "Registering TestUser '$userName' in container '$containerName'" echo "Registering TestUser '$userName' in container '$containerName'"
sudo docker compose exec "$containerName" /bin/bash -c "prosodyctl register $userName example.com 12345678" sudo docker compose exec "$containerName" /bin/bash -c "prosodyctl register $userName example.com 12345678"
#sudo docker compose exec -e DOMAIN=example.com "$containerName" prosodyctl register "$userName" example.com 12345678
} }
registerTestUsers() { registerTestUsers() {
@@ -48,6 +47,13 @@ runTests() {
&& ./bats/bats-core/bin/bats tests-"$containerName".bats && ./bats/bats-core/bin/bats tests-"$containerName".bats
} }
checkConfig() {
local containerName="$1"
sudo docker compose up -d "$containerName"
sudo docker compose exec -T "$containerName" prosodyctl check config || true
sudo docker compose down
}
generateCert "example.com" generateCert "example.com"
generateCert "conference.example.com" generateCert "conference.example.com"
generateCert "proxy.example.com" generateCert "proxy.example.com"
@@ -56,22 +62,25 @@ generateCert "upload.example.com"
# Run tests for first container with postgres # Run tests for first container with postgres
# Start postgres first and wait for 10 seconds before starting prosody. # Start postgres first and wait for 10 seconds before starting prosody.
docker compose down sudo docker compose down
docker compose up -d postgres sudo docker compose up -d postgres
sleep 10 sleep 10
docker compose up -d prosody_postgres sudo docker compose up -d prosody_postgres
registerTestUsers prosody_postgres registerTestUsers prosody_postgres
runTests prosody_postgres runTests prosody_postgres
docker compose down sudo docker compose down
# Run tests for second container with SQLite # Run tests for second container with SQLite
docker compose up -d prosody sudo docker compose up -d prosody
sleep 5 sleep 5
registerTestUsers prosody registerTestUsers prosody
runTests prosody runTests prosody
docker compose down sudo docker compose down
# Run tests for prosody with ldap # Run tests for prosody with ldap
docker compose up -d prosody_ldap sudo docker compose up -d prosody_ldap
runTests prosody_ldap runTests prosody_ldap
docker compose down sudo docker compose down
# Check server config
checkConfig prosody