Use docker directly in NPM test runner
The checking of the container status should use docker directly.
This commit is contained in:
@ -3,6 +3,7 @@ services:
|
|||||||
server1:
|
server1:
|
||||||
image: mariadb:10.2
|
image: mariadb:10.2
|
||||||
network_mode: "host"
|
network_mode: "host"
|
||||||
|
container_name: server1
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ALLOW_EMPTY_PASSWORD: Y
|
MYSQL_ALLOW_EMPTY_PASSWORD: Y
|
||||||
volumes:
|
volumes:
|
||||||
@ -11,6 +12,7 @@ services:
|
|||||||
|
|
||||||
server2:
|
server2:
|
||||||
image: mariadb:10.2
|
image: mariadb:10.2
|
||||||
|
container_name: server2
|
||||||
network_mode: "host"
|
network_mode: "host"
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ALLOW_EMPTY_PASSWORD: Y
|
MYSQL_ALLOW_EMPTY_PASSWORD: Y
|
||||||
@ -20,6 +22,7 @@ services:
|
|||||||
|
|
||||||
server3:
|
server3:
|
||||||
image: mariadb:10.2
|
image: mariadb:10.2
|
||||||
|
container_name: server3
|
||||||
network_mode: "host"
|
network_mode: "host"
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ALLOW_EMPTY_PASSWORD: Y
|
MYSQL_ALLOW_EMPTY_PASSWORD: Y
|
||||||
@ -29,6 +32,7 @@ services:
|
|||||||
|
|
||||||
server4:
|
server4:
|
||||||
image: mariadb:10.2
|
image: mariadb:10.2
|
||||||
|
container_name: server4
|
||||||
network_mode: "host"
|
network_mode: "host"
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ALLOW_EMPTY_PASSWORD: Y
|
MYSQL_ALLOW_EMPTY_PASSWORD: Y
|
||||||
|
@ -80,7 +80,7 @@ do
|
|||||||
printf "Waiting for $node to start... "
|
printf "Waiting for $node to start... "
|
||||||
for ((i=0; i<60; i++))
|
for ((i=0; i<60; i++))
|
||||||
do
|
do
|
||||||
docker-compose exec $node mysql -umaxuser -pmaxpwd -e "select 1" >& /dev/null && break
|
docker exec -ti $node mysql -umaxuser -pmaxpwd -e "select 1" >& /dev/null && break
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
echo "Done!"
|
echo "Done!"
|
||||||
|
Reference in New Issue
Block a user