Browse Source

Update tests to use "docker rm -v" so volumes get cleaned up too

Tianon Gravi 10 năm trước cách đây
mục cha
commit
c91c1eb20c

+ 1 - 1
test/tests/mongo-basics/run.sh

@@ -5,7 +5,7 @@ image="$1"
 
 cname="mongo-container-$RANDOM-$RANDOM"
 cid="$(docker run -d --name "$cname" "$image")"
-trap "docker rm -f $cid > /dev/null" EXIT
+trap "docker rm -vf $cid > /dev/null" EXIT
 
 mongo() {
 	docker run --rm -i --link "$cname":mongo --entrypoint mongo "$image" --host mongo "$@"

+ 1 - 1
test/tests/mysql-basics/run.sh

@@ -18,7 +18,7 @@ cid="$(
 		--name "$cname" \
 		"$image"
 )"
-trap "docker rm -f $cid > /dev/null" EXIT
+trap "docker rm -vf $cid > /dev/null" EXIT
 
 mysql() {
 	docker run --rm -i \

+ 1 - 1
test/tests/mysql-initdb/run.sh

@@ -20,7 +20,7 @@ cid="$(
 		-v "$testDir/initdb.sql:/docker-entrypoint-initdb.d/test.sql":ro \
 		"$image"
 )"
-trap "docker rm -f $cid > /dev/null" EXIT
+trap "docker rm -vf $cid > /dev/null" EXIT
 
 mysql() {
 	docker run --rm -i \

+ 1 - 1
test/tests/php-fpm-hello-web/run.sh

@@ -18,7 +18,7 @@ EOF
 
 # Create an instance of the container-under-test
 cid="$(docker run -d -v "$dir/index.php":/var/www/html/index.php:ro "$image")"
-trap "docker rm -f $cid > /dev/null" EXIT
+trap "docker rm -vf $cid > /dev/null" EXIT
 
 # RACY TESTS ARE RACY
 sleep 1

+ 1 - 1
test/tests/postgres-basics/run.sh

@@ -9,7 +9,7 @@ export POSTGRES_DB='my cool postgres database'
 
 cname="postgres-container-$RANDOM-$RANDOM"
 cid="$(docker run -d -e POSTGRES_USER -e POSTGRES_PASSWORD -e POSTGRES_DB --name "$cname" "$image")"
-trap "docker rm -f $cid > /dev/null" EXIT
+trap "docker rm -vf $cid > /dev/null" EXIT
 
 psql() {
 	docker run --rm -i \

+ 1 - 1
test/tests/postgres-initdb/run.sh

@@ -18,7 +18,7 @@ cid="$(
 		-v "$testDir/initdb.sql:/docker-entrypoint-initdb.d/test.sql":ro \
 		"$image"
 )"
-trap "docker rm -f $cid > /dev/null" EXIT
+trap "docker rm -vf $cid > /dev/null" EXIT
 
 psql() {
 	docker run --rm -i \