diff --git a/imgbom/cataloger/bundler/cataloger.go b/imgbom/cataloger/bundler/cataloger.go index 91de47d2f..1c954f599 100644 --- a/imgbom/cataloger/bundler/cataloger.go +++ b/imgbom/cataloger/bundler/cataloger.go @@ -13,7 +13,7 @@ type Cataloger struct { func NewCataloger() *Cataloger { globParsers := map[string]common.ParserFn{ - "*/Gemfile.lock": parseGemfileLockEntries, + "**/Gemfile.lock": parseGemfileLockEntries, } return &Cataloger{ diff --git a/imgbom/cataloger/dpkg/cataloger.go b/imgbom/cataloger/dpkg/cataloger.go index 02a85ef41..f1df32598 100644 --- a/imgbom/cataloger/dpkg/cataloger.go +++ b/imgbom/cataloger/dpkg/cataloger.go @@ -12,12 +12,12 @@ type Cataloger struct { } func NewCataloger() *Cataloger { - pathParsers := map[string]common.ParserFn{ - "/var/lib/dpkg/status": parseDpkgStatus, + globParsers := map[string]common.ParserFn{ + "**/var/lib/dpkg/status": parseDpkgStatus, } return &Cataloger{ - cataloger: common.NewGenericCataloger(pathParsers, nil), + cataloger: common.NewGenericCataloger(nil, globParsers), } } diff --git a/imgbom/cataloger/java/archive_parser.go b/imgbom/cataloger/java/archive_parser.go index df9010184..7047cc449 100644 --- a/imgbom/cataloger/java/archive_parser.go +++ b/imgbom/cataloger/java/archive_parser.go @@ -11,11 +11,11 @@ import ( ) var archiveFormatGlobs = []string{ - "*.jar", - "*.war", - "*.ear", - "*.jpi", - "*.hpi", + "**/*.jar", + "**/*.war", + "**/*.ear", + "**/*.jpi", + "**/*.hpi", } type archiveParser struct { diff --git a/imgbom/cataloger/python/cataloger.go b/imgbom/cataloger/python/cataloger.go index 5bf693223..6b0e6e5cd 100644 --- a/imgbom/cataloger/python/cataloger.go +++ b/imgbom/cataloger/python/cataloger.go @@ -13,8 +13,8 @@ type Cataloger struct { func NewCataloger() *Cataloger { globParsers := map[string]common.ParserFn{ - "*egg-info/PKG-INFO": parseEggMetadata, - "*dist-info/METADATA": parseWheelMetadata, + "**/egg-info/PKG-INFO": parseEggMetadata, + "**/dist-info/METADATA": parseWheelMetadata, } return &Cataloger{ diff --git a/imgbom/cataloger/rpmdb/cataloger.go b/imgbom/cataloger/rpmdb/cataloger.go index b460cc783..0f11d3718 100644 --- a/imgbom/cataloger/rpmdb/cataloger.go +++ b/imgbom/cataloger/rpmdb/cataloger.go @@ -12,12 +12,12 @@ type Cataloger struct { } func NewCataloger() *Cataloger { - pathParsers := map[string]common.ParserFn{ - "/var/lib/rpm/Packages": parseRpmDB, + globParsers := map[string]common.ParserFn{ + "**/var/lib/rpm/Packages": parseRpmDB, } return &Cataloger{ - cataloger: common.NewGenericCataloger(pathParsers, nil), + cataloger: common.NewGenericCataloger(nil, globParsers), } }