add support for opencontainers meta labels

pkg/session/container_status.go

@@ -25,7 +25,9 @@ type ContainerStatus struct {
 	containerName string
 	imageName     string
 	error
-	state State
+	state      State
+	beforeMeta imageMeta
+	afterMeta  imageMeta
 }
 
 // ID returns the container ID
@@ -80,3 +82,13 @@ func (u *ContainerStatus) State() string {
 		return "Unknown"
 	}
 }
+
+// Before returns the metadata for the image considered latest before the session
+func (u *ContainerStatus) Before() wt.ImageMeta {
+	return u.beforeMeta
+}
+
+// After returns the metadata for the image considered latest after the session
+func (u *ContainerStatus) After() wt.ImageMeta {
+	return u.afterMeta
+}

pkg/session/image_meta.go

@@ -0,0 +1,55 @@
+package session
+
+import "strings"
+
+type imageMeta map[string]string
+
+func imageMetaFromLabels(labels map[string]string) imageMeta {
+	im := make(imageMeta)
+	for key, value := range labels {
+		if suffix, found := strings.CutPrefix(key, "org.opencontainers.image."); found {
+			im[suffix] = value
+		}
+	}
+	return im
+}
+
+func (im imageMeta) Authors() string {
+	return im["authors"]
+}
+
+func (im imageMeta) Created() string {
+	return im["created"]
+}
+
+func (im imageMeta) Description() string {
+	return im["description"]
+}
+
+func (im imageMeta) Documentation() string {
+	return im["documentation"]
+}
+
+func (im imageMeta) Licenses() string {
+	return im["licenses"]
+}
+
+func (im imageMeta) Revision() string {
+	return im["revision"]
+}
+
+func (im imageMeta) Source() string {
+	return im["source"]
+}
+
+func (im imageMeta) Title() string {
+	return im["title"]
+}
+
+func (im imageMeta) Url() string {
+	return im["url"]
+}
+
+func (im imageMeta) Version() string {
+	return im["version"]
+}

pkg/session/progress.go

@@ -2,6 +2,7 @@ package session
 
 import (
 	"github.com/containrrr/watchtower/pkg/types"
+	dockerTypes "github.com/docker/docker/api/types"
 )
 
 // Progress contains the current session container status
@@ -9,6 +10,14 @@ type Progress map[types.ContainerID]*ContainerStatus
 
 // UpdateFromContainer sets various status fields from their corresponding container equivalents
 func UpdateFromContainer(cont types.Container, newImage types.ImageID, state State) *ContainerStatus {
+
+	var beforeMeta imageMeta
+	if imageInfo := cont.ImageInfo(); imageInfo != nil && imageInfo.Config != nil {
+		beforeMeta = imageMetaFromLabels(imageInfo.Config.Labels)
+	} else {
+		beforeMeta = make(imageMeta)
+	}
+
 	return &ContainerStatus{
 		containerID:   cont.ID(),
 		containerName: cont.Name(),
@@ -16,6 +25,8 @@ func UpdateFromContainer(cont types.Container, newImage types.ImageID, state Sta
 		oldImage:      cont.SafeImageID(),
 		newImage:      newImage,
 		state:         state,
+		beforeMeta:    beforeMeta,
+		afterMeta:     beforeMeta,
 	}
 }
 
@@ -27,8 +38,9 @@ func (m Progress) AddSkipped(cont types.Container, err error) {
 }
 
 // AddScanned adds a container to the Progress with the state set as scanned
-func (m Progress) AddScanned(cont types.Container, newImage types.ImageID) {
-	m.Add(UpdateFromContainer(cont, newImage, ScannedState))
+func (m Progress) AddScanned(cont types.Container, newImageID types.ImageID) {
+	m.Add(UpdateFromContainer(cont, newImageID, ScannedState))
+
 }
 
 // UpdateFailed updates the containers passed, setting their state as failed with the supplied error
@@ -54,3 +66,9 @@ func (m Progress) MarkForUpdate(containerID types.ContainerID) {
 func (m Progress) Report() types.Report {
 	return NewReport(m)
 }
+
+func (m Progress) UpdateLatestImage(containerID types.ContainerID, image dockerTypes.ImageInspect) {
+	if image.Config != nil {
+		m[containerID].afterMeta = imageMetaFromLabels(image.Config.Labels)
+	}
+}