From 9bcf3d3026a8c3fc2b0a96808a3c040521cb91bc Mon Sep 17 00:00:00 2001 From: cx-Margarita-LevitM Date: Wed, 11 Feb 2026 19:35:40 +0200 Subject: [PATCH 1/3] fix bug number AST-127598 --- go.mod | 2 +- go.sum | 1 + pkg/imagesExtractor/utils.go | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3b38d69..cd42bb3 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/Masterminds/sprig/v3 v3.3.0 // indirect github.com/Masterminds/squirrel v1.5.4 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect - github.com/Microsoft/hcsshim v0.13.1-0.20250731174403-0842153594e0 // indirect + github.com/Microsoft/hcsshim v0.13.0 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect github.com/antlr4-go/antlr/v4 v4.13.0 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect diff --git a/go.sum b/go.sum index 8753370..5d3c39d 100644 --- a/go.sum +++ b/go.sum @@ -34,6 +34,7 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Microsoft/hcsshim v0.11.7 h1:vl/nj3Bar/CvJSYo7gIQPyRWc9f3c6IeSNavBTSZNZQ= github.com/Microsoft/hcsshim v0.11.7/go.mod h1:MV8xMfmECjl5HdO7U/3/hFVnkmSBjAjmA09d4bExKcU= +github.com/Microsoft/hcsshim v0.13.0/go.mod h1:9KWJ/8DgU+QzYGupX4tzMhRQE8h6w90lH6HAaclpEok= github.com/Microsoft/hcsshim v0.13.1-0.20250731174403-0842153594e0 h1:HBsAEmISuZmBrZJ0MUPKuQM06TsIrcixG8Had8haKbM= github.com/Microsoft/hcsshim v0.13.1-0.20250731174403-0842153594e0/go.mod h1:hTKFGbnDtQb1wHiOWv4v0eN+7boSWAHyK/tNAaYZL0c= github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= diff --git a/pkg/imagesExtractor/utils.go b/pkg/imagesExtractor/utils.go index 1115fd3..2216cf5 100644 --- a/pkg/imagesExtractor/utils.go +++ b/pkg/imagesExtractor/utils.go @@ -12,8 +12,8 @@ import ( ) var ( - dockerfilePattern = regexp.MustCompile(`^Dockerfile(?:-[a-zA-Z0-9]+|\.[a-zA-Z0-9.]+|[a-zA-Z0-9.]+)?$`) - dockerComposePattern = regexp.MustCompile(`docker-compose(-[a-zA-Z0-9]+)?(\.yml|\.yaml)$`) + dockerfilePattern = regexp.MustCompile(`^.*[d/D]ockerfile.*$`) + dockerComposePattern = regexp.MustCompile(`^.*[d/D]ocker-compose.[Y/y]a?ml$`) ) func IsValidFolderPath(path string) (bool, error) { From 69a7bb587deb38094f9e9cc00484a580000b6564 Mon Sep 17 00:00:00 2001 From: cx-Margarita-LevitM Date: Wed, 11 Feb 2026 19:54:26 +0200 Subject: [PATCH 2/3] fix test that failed --- pkg/imagesExtractor/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/imagesExtractor/utils.go b/pkg/imagesExtractor/utils.go index de8ca34..21180dc 100644 --- a/pkg/imagesExtractor/utils.go +++ b/pkg/imagesExtractor/utils.go @@ -12,7 +12,7 @@ import ( ) var ( - dockerfilePattern = regexp.MustCompile(`^.*[d/D]ockerfile.*$`) + dockerfilePattern = regexp.MustCompile(`^.*[d/D]ockerfile*$`) dockerComposePattern = regexp.MustCompile(`^.*[d/D]ocker-compose.[Y/y]a?ml$`) ) From afc7162faa4288ed452d966dc29c2dd0665993f0 Mon Sep 17 00:00:00 2001 From: cx-Margarita-LevitM Date: Sun, 15 Feb 2026 14:48:27 +0200 Subject: [PATCH 3/3] fix test that failed --- pkg/imagesExtractor/utils.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/imagesExtractor/utils.go b/pkg/imagesExtractor/utils.go index 21180dc..f446684 100644 --- a/pkg/imagesExtractor/utils.go +++ b/pkg/imagesExtractor/utils.go @@ -12,8 +12,8 @@ import ( ) var ( - dockerfilePattern = regexp.MustCompile(`^.*[d/D]ockerfile*$`) - dockerComposePattern = regexp.MustCompile(`^.*[d/D]ocker-compose.[Y/y]a?ml$`) + dockerfilePattern = regexp.MustCompile(`(?i)dockerfile([.-].*)?$`) + dockerComposePattern = regexp.MustCompile(`(?i)docker-compose([.-].*)?\.ya?ml$`) ) func IsValidFolderPath(path string) (bool, error) {