mirror of
https://github.com/containers/skopeo.git
synced 2025-08-10 19:02:28 +00:00
Share the logrus.WithFields settings over the loop bodies
to avoid the maddening repetitivenes. Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
parent
0ae9db5dd6
commit
56c6325ba0
@ -274,10 +274,11 @@ func imagesToCopyFromRegistry(registryName string, cfg registrySyncConfig, sourc
|
|||||||
var repoDescList []repoDescriptor
|
var repoDescList []repoDescriptor
|
||||||
for imageName, tags := range cfg.Images {
|
for imageName, tags := range cfg.Images {
|
||||||
repoName := fmt.Sprintf("//%s", path.Join(registryName, imageName))
|
repoName := fmt.Sprintf("//%s", path.Join(registryName, imageName))
|
||||||
logrus.WithFields(logrus.Fields{
|
repoLogger := logrus.WithFields(logrus.Fields{
|
||||||
"repo": imageName,
|
"repo": imageName,
|
||||||
"registry": registryName,
|
"registry": registryName,
|
||||||
}).Info("Processing repo")
|
})
|
||||||
|
repoLogger.Info("Processing repo")
|
||||||
|
|
||||||
var sourceReferences []types.ImageReference
|
var sourceReferences []types.ImageReference
|
||||||
if len(tags) != 0 {
|
if len(tags) != 0 {
|
||||||
@ -295,37 +296,25 @@ func imagesToCopyFromRegistry(registryName string, cfg registrySyncConfig, sourc
|
|||||||
sourceReferences = append(sourceReferences, imageRef)
|
sourceReferences = append(sourceReferences, imageRef)
|
||||||
}
|
}
|
||||||
} else { // len(tags) == 0
|
} else { // len(tags) == 0
|
||||||
logrus.WithFields(logrus.Fields{
|
repoLogger.Info("Querying registry for image tags")
|
||||||
"repo": imageName,
|
|
||||||
"registry": registryName,
|
|
||||||
}).Info("Querying registry for image tags")
|
|
||||||
|
|
||||||
imageRef, err := docker.ParseReference(repoName)
|
imageRef, err := docker.ParseReference(repoName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.WithFields(logrus.Fields{
|
repoLogger.Error("Error processing repo, skipping")
|
||||||
"repo": imageName,
|
|
||||||
"registry": registryName,
|
|
||||||
}).Error("Error processing repo, skipping")
|
|
||||||
logrus.Error(err)
|
logrus.Error(err)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceReferences, err = imagesToCopyFromRepo(imageRef, repoName, serverCtx)
|
sourceReferences, err = imagesToCopyFromRepo(imageRef, repoName, serverCtx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.WithFields(logrus.Fields{
|
repoLogger.Error("Error processing repo, skipping")
|
||||||
"repo": imageName,
|
|
||||||
"registry": registryName,
|
|
||||||
}).Error("Error processing repo, skipping")
|
|
||||||
logrus.Error(err)
|
logrus.Error(err)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(sourceReferences) == 0 {
|
if len(sourceReferences) == 0 {
|
||||||
logrus.WithFields(logrus.Fields{
|
repoLogger.Warnf("No tags to sync found")
|
||||||
"repo": imageName,
|
|
||||||
"registry": registryName,
|
|
||||||
}).Warnf("No tags to sync found")
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
repoDescList = append(repoDescList, repoDescriptor{
|
repoDescList = append(repoDescList, repoDescriptor{
|
||||||
@ -335,51 +324,37 @@ func imagesToCopyFromRegistry(registryName string, cfg registrySyncConfig, sourc
|
|||||||
|
|
||||||
for imageName, tagRegex := range cfg.ImagesByTagRegex {
|
for imageName, tagRegex := range cfg.ImagesByTagRegex {
|
||||||
repoName := fmt.Sprintf("//%s", path.Join(registryName, imageName))
|
repoName := fmt.Sprintf("//%s", path.Join(registryName, imageName))
|
||||||
logrus.WithFields(logrus.Fields{
|
repoLogger := logrus.WithFields(logrus.Fields{
|
||||||
"repo": imageName,
|
"repo": imageName,
|
||||||
"registry": registryName,
|
"registry": registryName,
|
||||||
}).Info("Processing repo")
|
})
|
||||||
|
repoLogger.Info("Processing repo")
|
||||||
|
|
||||||
var sourceReferences []types.ImageReference
|
var sourceReferences []types.ImageReference
|
||||||
|
|
||||||
tagReg, err := regexp.Compile(tagRegex)
|
tagReg, err := regexp.Compile(tagRegex)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.WithFields(logrus.Fields{
|
repoLogger.Error("Error processing repo, skipping")
|
||||||
"repo": imageName,
|
|
||||||
"registry": registryName,
|
|
||||||
}).Error("Error processing repo, skipping")
|
|
||||||
logrus.Error(err)
|
logrus.Error(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.WithFields(logrus.Fields{
|
repoLogger.Info("Querying registry for image tags")
|
||||||
"repo": imageName,
|
|
||||||
"registry": registryName,
|
|
||||||
}).Info("Querying registry for image tags")
|
|
||||||
|
|
||||||
imageRef, err := docker.ParseReference(repoName)
|
imageRef, err := docker.ParseReference(repoName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.WithFields(logrus.Fields{
|
repoLogger.Error("Error processing repo, skipping")
|
||||||
"repo": imageName,
|
|
||||||
"registry": registryName,
|
|
||||||
}).Error("Error processing repo, skipping")
|
|
||||||
logrus.Error(err)
|
logrus.Error(err)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
allSourceReferences, err := imagesToCopyFromRepo(imageRef, repoName, serverCtx)
|
allSourceReferences, err := imagesToCopyFromRepo(imageRef, repoName, serverCtx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.WithFields(logrus.Fields{
|
repoLogger.Error("Error processing repo, skipping")
|
||||||
"repo": imageName,
|
|
||||||
"registry": registryName,
|
|
||||||
}).Error("Error processing repo, skipping")
|
|
||||||
logrus.Error(err)
|
logrus.Error(err)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
logrus.WithFields(logrus.Fields{
|
repoLogger.Infof("Start filtering using the regular expression: %v", tagRegex)
|
||||||
"repo": imageName,
|
|
||||||
"registry": registryName,
|
|
||||||
}).Infof("Start filtering using the regular expression: %v", tagRegex)
|
|
||||||
for _, sReference := range allSourceReferences {
|
for _, sReference := range allSourceReferences {
|
||||||
// get the tag names to match, [1] default is "latest" by .DockerReference().String()
|
// get the tag names to match, [1] default is "latest" by .DockerReference().String()
|
||||||
if tagReg.Match([]byte(strings.Split(sReference.DockerReference().String(), ":")[1])) {
|
if tagReg.Match([]byte(strings.Split(sReference.DockerReference().String(), ":")[1])) {
|
||||||
@ -388,10 +363,7 @@ func imagesToCopyFromRegistry(registryName string, cfg registrySyncConfig, sourc
|
|||||||
}
|
}
|
||||||
|
|
||||||
if len(sourceReferences) == 0 {
|
if len(sourceReferences) == 0 {
|
||||||
logrus.WithFields(logrus.Fields{
|
repoLogger.Warnf("No tags to sync found")
|
||||||
"repo": imageName,
|
|
||||||
"registry": registryName,
|
|
||||||
}).Warnf("No tags to sync found")
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
repoDescList = append(repoDescList, repoDescriptor{
|
repoDescList = append(repoDescList, repoDescriptor{
|
||||||
|
Loading…
Reference in New Issue
Block a user