Andreas/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2025-09-22 05:40:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add label definitions that allow containers to override image name and id

Browse source
This commit is contained in:
Amin Faez 2024-05-08 21:03:14 +02:00
parent 76f9cea516
commit 85ea00f3ad
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/container/client.go
View file

@ -332,6 +332,12 @@ func (client dockerClient) HasNewImage(ctx context.Context, container t.Containe
currentImageID := t.ImageID(container.ContainerInfo().ContainerJSONBase.Image) currentImageID := t.ImageID(container.ContainerInfo().ContainerJSONBase.Image)
imageName := container.ImageName() imageName := container.ImageName()
imageIDSetByLabel, ok := container.ContainerInfo().Config.Labels[originalImageIDLabel]
if ok {
currentImageID = t.ImageID(imageIDSetByLabel)
log.Infof("Original image id for %s found: (%s)", imageName, currentImageID.ShortID())
}
newImageInfo, _, err := client.api.ImageInspectWithRaw(ctx, imageName) newImageInfo, _, err := client.api.ImageInspectWithRaw(ctx, imageName)
if err != nil { if err != nil {
return false, currentImageID, err return false, currentImageID, err

2
pkg/container/container.go
View file

@ -103,7 +103,7 @@ func (c Container) SafeImageID() wt.ImageID {
// "latest" tag is assumed. // "latest" tag is assumed.
func (c Container) ImageName() string { func (c Container) ImageName() string {
// Compatibility w/ Zodiac deployments // Compatibility w/ Zodiac deployments
imageName, ok := c.getLabelValue(zodiacLabel) imageName, ok := c.getLabelValue(originalImageNameLabel)
if !ok { if !ok {
imageName = c.containerInfo.Config.Image imageName = c.containerInfo.Config.Image
} }

2
pkg/container/metadata.go
View file

@ -10,6 +10,8 @@ const (
noPullLabel = "com.centurylinklabs.watchtower.no-pull" noPullLabel = "com.centurylinklabs.watchtower.no-pull"
dependsOnLabel = "com.centurylinklabs.watchtower.depends-on" dependsOnLabel = "com.centurylinklabs.watchtower.depends-on"
zodiacLabel = "com.centurylinklabs.zodiac.original-image" zodiacLabel = "com.centurylinklabs.zodiac.original-image"
originalImageNameLabel = "com.centurylinklabs.watchtower.original-image"
originalImageIDLabel = "com.centurylinklabs.watchtower.original-image-id"
scope = "com.centurylinklabs.watchtower.scope" scope = "com.centurylinklabs.watchtower.scope"
preCheckLabel = "com.centurylinklabs.watchtower.lifecycle.pre-check" preCheckLabel = "com.centurylinklabs.watchtower.lifecycle.pre-check"
postCheckLabel = "com.centurylinklabs.watchtower.lifecycle.post-check" postCheckLabel = "com.centurylinklabs.watchtower.lifecycle.post-check"