Merge master and fix conflicts

internal/actions/update_test.go

@@ -5,6 +5,7 @@ import (
 	"github.com/containrrr/watchtower/pkg/container"
 	"github.com/containrrr/watchtower/pkg/container/mocks"
 	"github.com/containrrr/watchtower/pkg/types"
+	container2 "github.com/docker/docker/api/types/container"
 	cli "github.com/docker/docker/client"
 	"time"
 
@@ -228,4 +229,73 @@ var _ = Describe("the update action", func() {
 			})
 		})
 	})
+
+	When("watchtower has been instructed to monitor only", func() {
+		When("certain containers are set to monitor only", func() {
+			BeforeEach(func() {
+				client = CreateMockClient(
+					&TestData{
+						NameOfContainerToKeep: "test-container-02",
+						Containers: []container.Container{
+							CreateMockContainer(
+								"test-container-01",
+								"test-container-01",
+								"fake-image1:latest",
+								time.Now()),
+							CreateMockContainerWithConfig(
+								"test-container-02",
+								"test-container-02",
+								"fake-image2:latest",
+								time.Now(),
+								&container2.Config{
+									Labels: map[string]string{
+										"com.centurylinklabs.watchtower.monitor-only": "true",
+									},
+								}),
+						},
+					},
+					dockerClient,
+					false,
+					false,
+				)
+			})
+
+			It("should not update those containers", func() {
+				err := actions.Update(client, types.UpdateParams{Cleanup: true})
+				Expect(err).NotTo(HaveOccurred())
+				Expect(client.TestData.TriedToRemoveImageCount).To(Equal(1))
+			})
+		})
+
+		When("monitor only is set globally", func() {
+			BeforeEach(func() {
+				client = CreateMockClient(
+					&TestData{
+						Containers: []container.Container{
+							CreateMockContainer(
+								"test-container-01",
+								"test-container-01",
+								"fake-image:latest",
+								time.Now()),
+							CreateMockContainer(
+								"test-container-02",
+								"test-container-02",
+								"fake-image:latest",
+								time.Now()),
+						},
+					},
+					dockerClient,
+					false,
+					false,
+				)
+			})
+
+			It("should not update any containers", func() {
+				err := actions.Update(client, types.UpdateParams{MonitorOnly: true})
+				Expect(err).NotTo(HaveOccurred())
+				Expect(client.TestData.TriedToRemoveImageCount).To(Equal(0))
+			})
+		})
+
+	})
 })