Remover container mesmo com erro no teste

Carlos Vieira
1 parent dd01fef2
Showing 1 changed file with 3 additions and 3 deletions Show diff stats
makefile
@@ -23,9 +23,9 @@ testReport:
 teste:
 		docker build docker -t barra-govbr-image
 		docker run -dit -p 80:80 --name barra-govbr barra-govbr-image
-		npm run test
-		docker rm -f barra-govbr
-		docker rmi -f barra-govbr-image
+# TODO usar trap para EXIT
+		npm run test || (docker rm -f barra-govbr &&	docker rmi -f barra-govbr-image)
+		docker rm -f barra-govbr && docker rmi -f barra-govbr-image
...	...	@@ -23,9 +23,9 @@ testReport:
23	23	teste:
24	24	docker build docker -t barra-govbr-image
25	25	docker run -dit -p 80:80 --name barra-govbr barra-govbr-image
26		- npm run test
27		- docker rm -f barra-govbr
28		- docker rmi -f barra-govbr-image
	26	+# TODO usar trap para EXIT
	27	+ npm run test \|\| (docker rm -f barra-govbr && docker rmi -f barra-govbr-image)
	28	+ docker rm -f barra-govbr && docker rmi -f barra-govbr-image
29	29
30	30
31	31
...	...