Add docker rm for on-failure