Refactor build into stageBuilder type #343
Merged
Conversation
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
Refactoring builds by stage will make it easier to generate cache keys for layers, since the stageBuilder type will contain everything required to generate the key: 1. Base image with digest 2. Config file 3. Snapshotter (which will provide a key for the filesystem) 4. The current command (which will be passed in)
priyawadhwa
force-pushed
the
stagebuilder
branch
from
f317562
to
d9022dd
Compare
tejal29
reviewed
Sep 11, 2018
pkg/executor/build.go
Outdated
| } | ||
| snapshotFiles := dockerCommand.FilesToSnapshot() | ||
| var contents []byte | ||
| snapshotFiles := dockerCommand.FilesToSnapshot() |
There was a problem hiding this comment.
nit: use shorter variables names wherever possible.
Just files will suffice.
tejal29
reviewed
Sep 12, 2018
pkg/executor/build.go
Outdated
| return nil | ||
| } | ||
|
|
||
| func (s *stageBuilder) buildStage(opts *config.KanikoOptions) error { |
There was a problem hiding this comment.
Avoid Stuttering stageBuilder.buildStage().
Just stageBuilder.build() suffix
pkg/executor/build.go
Outdated
| if err := s.Snapshotter.Init(); err != nil { | ||
| return err | ||
| } | ||
| buildArgs := dockerfile.NewBuildArgs(opts.BuildArgs) |
There was a problem hiding this comment.
use shorter names when possible https://github.com/golang/go/wiki/CodeReviewComments#variable-names
args?
pkg/executor/build.go
Outdated
| buildArgs := dockerfile.NewBuildArgs(opts.BuildArgs) | ||
| for index, cmd := range s.stage.Commands { | ||
| finalCmd := index == len(s.stage.Commands)-1 | ||
| dockerCommand, err := commands.GetCommand(cmd, opts.SrcContext) |
There was a problem hiding this comment.
cmd is being used as the iterator here, maybe command if we really want to shorten it?
pkg/executor/build.go
Outdated
| // If this is an intermediate stage, we only snapshot for the last command and we | ||
| // want to snapshot the entire filesystem since we aren't tracking what was changed | ||
| // by previous commands. | ||
| if !s.stage.FinalStage { |
There was a problem hiding this comment.
stage.Final avoid stuttering stage.FinalStage
pkg/executor/build.go
Outdated
| return nil, err | ||
| } | ||
| for index, stage := range stages { | ||
| stageBuilder, err := newStageBuilder(opts, stage) |
There was a problem hiding this comment.
pkg/executor/build.go
Outdated
| } | ||
| sourceImage, err = mutate.Config(sourceImage, imageConfig.Config) | ||
| sourceImage, err := mutate.Config(stageBuilder.Image, stageBuilder.ConfigFile.Config) |
There was a problem hiding this comment.
if this is the only image. Use image or i
priyawadhwa
force-pushed
the
stagebuilder
branch
from
7bdebbd
to
ee9aa95
Compare
…ixed linting errors
tejal29
approved these changes
Sep 13, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactoring builds by stage will make it easier to generate cache keys
for layers, since the stageBuilder type will contain everything required
to generate the key: