WIP Install postgres and mysql dependencies. Add postgres to test, TODO Test all combinations postgres, sqlite and mysql/mariadb

This commit is contained in:
Sara Aimée Smiseth 2021-05-01 18:25:44 +02:00
parent d3f5a603e5
commit 3302ef9f0d
6 changed files with 30 additions and 26 deletions

View file

@ -15,8 +15,13 @@ services:
E2E_POLICY_WHITELIST: "admin@localhost, user1@localhost"
LOG_LEVEL: debug
PROSODY_ADMINS: "admin@localhost, admin2@localhost"
#DB_DRIVER: "SQLite3"
#DB_DATABASE: "prosody.sqlite"
#DB_DRIVER: "MySQL"
#DB_DRIVER: "PostgreSQL"
#DB_DATABASE: "prosody"
#DB_HOST: "postgres"
#DB_PORT: "5432"
#DB_USERNAME: "prosody"
#DB_PASSWORD: "prosody"
extra_hosts:
- "conference.localhost:127.0.0.1"
- "pubsub.localhost:127.0.0.1"

View file

@ -21,7 +21,10 @@ generateCert "proxy.localhost"
generateCert "pubsub.localhost"
generateCert "upload.localhost"
# Start postgres first and wait for 10 seconds before starting prosody.
sudo docker-compose down \
&& sudo docker-compose up -d postgres \
&& sleep 10 \
&& sudo docker-compose up -d \
\
&& sudo docker exec tests_prosody_1 /bin/bash -c "/entrypoint.sh register admin localhost 12345678" \