add commands support

Signed-off-by: Casey Lee <cplee@nektos.com>
This commit is contained in:
Casey Lee
2020-02-11 23:38:30 -08:00
parent 033168228b
commit f7252cbcf9
12 changed files with 303 additions and 33 deletions

View File

@@ -57,9 +57,7 @@ func (rc *RunContext) Executor() common.Executor {
}
s := step
steps = append(steps, func(ctx context.Context) error {
//common.Logger(ctx).Infof("\U0001F680 Begin %s", step)
//common.Logger(ctx).Infof("\u2728 Begin - %s", step)
common.Logger(ctx).Infof("\u2B50 Begin - %s", s)
common.Logger(ctx).Infof("\u2B50 Run %s", s)
err := rc.newStepExecutor(s)(ctx)
if err == nil {
common.Logger(ctx).Infof(" \u2705 Success - %s", s)
@@ -128,16 +126,10 @@ func (rc *RunContext) runContainer(containerSpec *model.ContainerSpec) common.Ex
entrypoint = strings.Fields(containerSpec.Entrypoint)
}
var logWriter io.Writer
logger := common.Logger(ctx)
if entry, ok := logger.(*log.Entry); ok {
logWriter = entry.Writer()
} else if lgr, ok := logger.(*log.Logger); ok {
logWriter = lgr.Writer()
} else {
logger.Errorf("Unable to get writer from logger (type=%T)", logger)
}
logWriter = os.Stdout
rawLogger := common.Logger(ctx).WithField("raw_output", true)
logWriter := common.NewLineWriter(rc.commandHandler(ctx), func(s string) {
rawLogger.Debugf(s)
})
return container.NewDockerRunExecutor(container.NewDockerRunExecutorInput{
Cmd: cmd,