clean up image and container

Signed-off-by: Ang Zhou <[email protected]>

e2e/vm/finch_config_file_test.go

@@ -20,9 +20,10 @@ import (
 // is written to ~/.finch/config.json file.
 var testFinchConfigFile = func(o *option.Option) {
 	ginkgo.Describe("finch config file", func() {
-		ginkgo.It("should store login credentials", func() {
+		ginkgo.FIt("should store login credentials", func() {
 			filename := "htpasswd"
 			registryImage := "public.ecr.aws/docker/library/registry:latest"
+			registryContainer := "registry"
 			// The htpasswd is generated by
 			// `finch run --entrypoint htpasswd public.ecr.aws/docker/library/httpd:2 -Bbn testUser testPassword`.
 			// We don't want to generate it on the fly because:
@@ -36,12 +37,14 @@ var testFinchConfigFile = func(o *option.Option) {
 			port := fnet.GetFreePort()
 			command.Run(o, "run",
 				"-dp", fmt.Sprintf("%d:5000", port),
-				"--name", "registry",
+				"--name", registryContainer,
 				"-v", fmt.Sprintf("%s:/auth", htpasswdDir),
 				"-e", "REGISTRY_AUTH=htpasswd",
 				"-e", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
 				"-e", fmt.Sprintf("REGISTRY_AUTH_HTPASSWD_PATH=/auth/%s", filename),
 				registryImage)
+			ginkgo.DeferCleanup(command.Run, o, "rmi", registryImage)
+			ginkgo.DeferCleanup(command.Run, o, "rm", "-f", registryContainer)
 			registry := fmt.Sprintf(`localhost:%d`, port)
 			command.Run(o, "login", registry, "-u", "testUser", "-p", "testPassword")