fix cleanup for rolling updates (#706)

containrrr · Dec 20, 2020 · 4d17cf1 · 4d17cf1
1 parent ea16683
commit 4d17cf1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/internal/actions/update.go b/internal/actions/update.go
@@ -73,6 +73,7 @@ func performRollingRestart(containers []container.Container, client container.Cl
 		if containers[i].Stale {
 			stopStaleContainer(containers[i], client, params)
 			restartStaleContainer(containers[i], client, params)
+			cleanupImageIDs[containers[i].ImageID()] = true
 		}
 	}
 

diff --git a/internal/actions/update_test.go b/internal/actions/update_test.go
@@ -80,6 +80,14 @@ var _ = Describe("the update action", func() {
 				Expect(client.TestData.TriedToRemoveImageCount).To(Equal(2))
 			})
 		})
+		When("performing a rolling restart update", func() {
+			It("should try to remove the image once", func() {
+
+				err := actions.Update(client, types.UpdateParams{Cleanup: true, RollingRestart: true})
+				Expect(err).NotTo(HaveOccurred())
+				Expect(client.TestData.TriedToRemoveImageCount).To(Equal(1))
+			})
+		})
 	})
 
 	When("watchtower has been instructed to monitor only", func() {