Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions pkg/commands/run_marker.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@ func (r *RunMarkerCommand) ExecuteCommand(config *v1.Config, buildArgs *dockerfi
return nil
}

func (r *RunMarkerCommand) CachedExecuteCommand(config *v1.Config, buildArgs *dockerfile.BuildArgs) error {
// TODO(mafredri): Check if we need to do more here.
r.Files = []string{}
return nil
}

// String returns some information about the command for the image config
func (r *RunMarkerCommand) String() string {
return r.cmd.String()
Expand Down
3 changes: 3 additions & 0 deletions pkg/executor/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,9 @@ func (s *stageBuilder) probeCache() error {
case *commands.RunCommand:
// If the cache is valid, we expect CachingRunCommand.
return errors.Errorf("uncached RUN command is not supported in cache probe mode")
case *commands.RunMarkerCommand:
// If the cache is valid, we expect CachingRunCommand.
return errors.Errorf("uncached RUN command is not supported in cache probe mode")
default:
return errors.Errorf("unsupported command %T encountered in cache probe mode, missing CachedExecuteCommand", command)
}
Expand Down