diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-05-06 11:20:44 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-05-06 11:33:59 +0200 |
| commit | 68accbf8e30db59d93ec894836aa0b0f78fc1ef4 (patch) | |
| tree | 30b70df53fc226d6eee18952e57f3cec0665d65f /pkg/bindings/images/build.go | |
| parent | 9b9bd9e0e7b72c91d8e60103e8da7999cefbc63d (diff) | |
| download | podman-68accbf8e30db59d93ec894836aa0b0f78fc1ef4.tar.gz podman-68accbf8e30db59d93ec894836aa0b0f78fc1ef4.tar.bz2 podman-68accbf8e30db59d93ec894836aa0b0f78fc1ef4.zip | |
build: improve regex for iidfile
improve the regex to match only at the beginning of the line.
It prevents matching "Copying %s $CHECKSUM" messages returned by the
containers/image copy process.
Closes: https://github.com/containers/podman/issues/10233
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/bindings/images/build.go')
| -rw-r--r-- | pkg/bindings/images/build.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index c0e5706a5..6acfcc1c8 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -28,6 +28,10 @@ import ( "github.com/sirupsen/logrus" ) +var ( + iidRegex = regexp.MustCompile(`^[0-9a-f]{12}`) +) + // Build creates an image using a containerfile reference func Build(ctx context.Context, containerFiles []string, options entities.BuildOptions) (*entities.BuildReport, error) { params := url.Values{} @@ -337,7 +341,6 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO } dec := json.NewDecoder(body) - re := regexp.MustCompile(`[0-9a-f]{12}`) var id string var mErr error @@ -366,7 +369,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO switch { case s.Stream != "": stdout.Write([]byte(s.Stream)) - if re.Match([]byte(s.Stream)) { + if iidRegex.Match([]byte(s.Stream)) { id = strings.TrimSuffix(s.Stream, "\n") } case s.Error != "": |