forked from wolfi-dev/os
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump kaniko and remediate a CVE with a patch.
I sent this upstream at GoogleContainerTools/kaniko#2916 Signed-off-by: Dan Lorenc <dlorenc@chainguard.dev>
- Loading branch information
Showing
3 changed files
with
51 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff --git a/pkg/commands/stopsignal.go b/pkg/commands/stopsignal.go | ||
index f73a70f4..964b6b70 100644 | ||
--- a/pkg/commands/stopsignal.go | ||
+++ b/pkg/commands/stopsignal.go | ||
@@ -19,9 +19,9 @@ package commands | ||
import ( | ||
"github.com/GoogleContainerTools/kaniko/pkg/dockerfile" | ||
"github.com/GoogleContainerTools/kaniko/pkg/util" | ||
- "github.com/docker/docker/pkg/signal" | ||
v1 "github.com/google/go-containerregistry/pkg/v1" | ||
"github.com/moby/buildkit/frontend/dockerfile/instructions" | ||
+ "github.com/moby/sys/signal" | ||
"github.com/sirupsen/logrus" | ||
) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
diff --git a/pkg/util/fs_util.go b/pkg/util/fs_util.go | ||
index 992eeaa5..058558b7 100644 | ||
--- a/pkg/util/fs_util.go | ||
+++ b/pkg/util/fs_util.go | ||
@@ -33,10 +33,10 @@ import ( | ||
"github.com/GoogleContainerTools/kaniko/pkg/config" | ||
"github.com/GoogleContainerTools/kaniko/pkg/timing" | ||
"github.com/docker/docker/pkg/archive" | ||
- "github.com/docker/docker/pkg/fileutils" | ||
v1 "github.com/google/go-containerregistry/pkg/v1" | ||
"github.com/karrick/godirwalk" | ||
"github.com/moby/buildkit/frontend/dockerfile/dockerignore" | ||
+ "github.com/moby/patternmatcher" | ||
otiai10Cpy "github.com/otiai10/copy" | ||
"github.com/pkg/errors" | ||
"github.com/sirupsen/logrus" | ||
@@ -788,7 +788,7 @@ func (c FileContext) ExcludesFile(path string) bool { | ||
return false | ||
} | ||
} | ||
- match, err := fileutils.Matches(path, c.ExcludedFiles) | ||
+ match, err := patternmatcher.Matches(path, c.ExcludedFiles) | ||
if err != nil { | ||
logrus.Errorf("Error matching, including %s in build: %v", path, err) | ||
return false |