public_git/kaniko
1
0
Fork 0
mirror of https://github.com/GoogleContainerTools/kaniko synced 2026-10-18 14:36:03 +02:00
Code Issues Releases Wiki Activity

Merge pull request #957 from antechrestos/fix/scopes_asked_to_remote_registry

Browse Source 
Upgrade go-containerregistry third-party library
This commit is contained in:
Cole Wippern
2020-01-28 16:00:21 -08:00
committed by GitHub
parent d0edea6bbc 03b8922ede
commit 65cd9124d1
1160 changed files with 107253 additions and 38471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/image_util.go
+4 -4
View File
@@ -49,12 +49,12 @@ var (
func RetrieveSourceImage(stage config.KanikoStage, opts *config.KanikoOptions) (v1.Image, error) {
t := timing.Start("Retrieving Source Image")
defer timing.DefaultRun.Stop(t)
buildArgs := opts.BuildArgs
var metaArgsString []string
var buildArgs []string
for _, arg := range stage.MetaArgs {
metaArgsString = append(metaArgsString, fmt.Sprintf("%s=%s", arg.Key, arg.ValueString()))
buildArgs = append(buildArgs, fmt.Sprintf("%s=%s", arg.Key, arg.ValueString()))
}
buildArgs = append(buildArgs, metaArgsString...)
buildArgs = append(buildArgs, opts.BuildArgs...)
currentBaseName, err := ResolveEnvironmentReplacement(stage.BaseName, buildArgs, false)
if err != nil {
return nil, err