Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit 074d65a

Browse files
committed
fixed docker setup?
1 parent 9e5d211 commit 074d65a

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

tests/ci/docker-compose.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

tests/ci/server-setup.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ port=4242
77
secret=baum42
88

99
[database]
10-
name=QtDataSync
11-
port=15432
12-
username=qtdatasync
10+
name=postgres
11+
port=5432
12+
username=postgres
1313
password=baum42

tests/ci/setup.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ if [[ $PLATFORM == "gcc_64" ]]; then
66
sudo curl -o /usr/local/bin/docker-compose -L "https://github.com/docker/compose/releases/download/1.14.0/docker-compose-$(uname -s)-$(uname -m)"
77
sudo chmod +x /usr/local/bin/docker-compose
88

9-
sudo docker-compose -f ./tests/ci/docker-compose.yaml up -d
10-
#docker run -d --name datasync_example_postgres -e POSTGRES_USER=qtdatasync -e POSTGRES_PASSWORD=baum42 -e POSTGRES_DB=QtDataSync postgres:latest
11-
9+
sudo docker run -d --name datasync_postgres -e "POSTGRES_PASSWORD=baum42" postgres:latest
1210

13-
postgresIp=$(sudo docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datasync_example_postgres)
11+
postgresIp=$(sudo docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datasync_postgres)
1412
echo host=$postgresIp >> ./tests/ci/server-setup.conf
1513
echo 'SETUP_FILE=$$PWD/../../../ci/server-setup.conf' > ./tests/auto/datasync/WsRemoteConnectorTest/setup.pri
1614
fi

0 commit comments

Comments
 (0)