Onbuild to use kaniko instead of docker #1366
Conversation
pkg/platform/kube/platform.go
Outdated
| @@ -647,6 +648,14 @@ func (p *Platform) BuildAndPushContainerImage(buildOptions *containerimagebuilde | |||
| return p.containerBuilder.BuildAndPushContainerImage(buildOptions, p.ResolveDefaultNamespace("")) | |||
| } | |||
|
|
|||
| func (p *Platform) GetOnbuildStages(onbuildArtifacts []runtime.Artifact) ([]string, error) { | |||
There was a problem hiding this comment.
Why not put this in abstract? It's the same behavior for both
| artifactIndex := 0 | ||
|
|
||
| stagedArtifactPaths := make(map[string]string) | ||
| for _, artifact := range onbuildArtifacts { |
There was a problem hiding this comment.
why not use artifactIndex as returned from range?
There was a problem hiding this comment.
Some of the artifacts may actually be external images, so a dedicated index counter for onbuild stages is needed
| @@ -88,6 +89,49 @@ func (k *Kaniko) BuildAndPushContainerImage(buildOptions *BuildOptions, namespac | |||
| return errors.New("Kaniko job has timed out") | |||
| } | |||
|
|
|||
| func (k *Kaniko) GetOnbuildStages(onbuildArtifacts []runtime.Artifact) ([]string, error) { | |||
There was a problem hiding this comment.
Wouldn't it be nicer to returned named stages? That way you don't have to do the whole artifact index thing and it'll be easier to read
| @@ -146,7 +146,7 @@ func getContainerBuilderConfiguration(platformConfiguration interface{}) *contai | |||
| } | |||
| if containerBuilderConfiguration.KanikoImage == "" { | |||
| containerBuilderConfiguration.KanikoImage = getEnvOrDefault("NUCLIO_KANIKO_CONTAINER_IMAGE", | |||
| "gcr.io/kaniko-project/executor:v0.9.0") | |||
| "gcr.io/kaniko-project/executor:v0.13.0") | |||
There was a problem hiding this comment.
Please don't forget to add this to artifact version manifest so it will be packaged
FelGel
force-pushed
the
multistage_kaniko
branch
from
cbc8012
to
db7a881
Compare
| artifact.Name = fmt.Sprintf("onbuildStage-%d", stage) | ||
| } | ||
|
|
||
| onbuildDockerfileContents := fmt.Sprintf(`FROM %s AS %s |
pkg/processor/build/builder.go
Outdated
| @@ -876,7 +944,7 @@ func (b *Builder) buildProcessorImage() (string, error) { | |||
| return "", errors.Wrap(err, "Failed to get build args") | |||
| } | |||
|
|
|||
| processorDockerfilePathInStaging, err := b.createProcessorDockerfile() | |||
| processorDockerfileInfo, err := b.createProcessorDockerfile(b.options.FunctionConfig.Spec.Build.Registry) | |||
There was a problem hiding this comment.
I would make a new variable for this - something like BaseImageRegistry or something. It may very well be different than the registry here (which is used to store the build artifacts)
No description provided.