From d9ed39a3781e6b925136a03b288456945dd8181f Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Fri, 23 Feb 2024 16:51:15 -0800 Subject: [PATCH] dockerfile2llb: fix ci merge conflict Signed-off-by: Tonis Tiigi --- frontend/dockerfile/dockerfile2llb/exclude_patterns_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/dockerfile/dockerfile2llb/exclude_patterns_test.go b/frontend/dockerfile/dockerfile2llb/exclude_patterns_test.go index 4d7a5ab7fba9..2e20e71b9599 100644 --- a/frontend/dockerfile/dockerfile2llb/exclude_patterns_test.go +++ b/frontend/dockerfile/dockerfile2llb/exclude_patterns_test.go @@ -14,7 +14,7 @@ func TestDockerfileCopyExcludePatterns(t *testing.T) { df := `FROM scratch COPY --exclude=src/*.go --exclude=tmp/*.txt dir /sub/ ` - _, _, _, err := Dockerfile2LLB(appcontext.Context(), []byte(df), ConvertOpt{}) + _, _, _, _, err := Dockerfile2LLB(appcontext.Context(), []byte(df), ConvertOpt{}) assert.NoError(t, err) } @@ -22,6 +22,6 @@ func TestDockerfileAddExcludePatterns(t *testing.T) { df := `FROM scratch ADD --exclude=src/*.go --exclude=tmp/*.txt dir /sub/ ` - _, _, _, err := Dockerfile2LLB(appcontext.Context(), []byte(df), ConvertOpt{}) + _, _, _, _, err := Dockerfile2LLB(appcontext.Context(), []byte(df), ConvertOpt{}) assert.NoError(t, err) }