updates after runner factored

This commit is contained in:
Henrique Chehad
2016-08-22 19:17:58 -03:00
parent bad6bb0c5d
commit 148d52c890
3 changed files with 22 additions and 2 deletions

View File

@@ -17,6 +17,7 @@ var (
ErrAppsNothingToUpdate = errors.New("Nothing to update")
ErrAppsMissingNew = errors.New("Missing new application")
ErrUsableImage = errors.New("Image not found")
ErrNewRunnerDriver = errors.New("Error creating the runner driver")
)
type App struct {

View File

@@ -64,6 +64,20 @@ func (r *Runner) Run(ctx context.Context, cfg *Config) (drivers.RunResult, error
return result, nil
}
func (r Runner) EnsureUsableImage(cfg *Config) error {
ctask := &containerTask{
cfg: cfg,
auth: &agent.ConfigAuth{},
}
err := r.driver.EnsureUsableImage(cfg.Ctx, ctask)
if err != nil {
return err
}
return nil
}
func selectDriver(driver string, env *common.Environment, conf *driverscommon.Config) (drivers.Driver, error) {
switch driver {
case "docker":

View File

@@ -38,12 +38,17 @@ func handleRouteCreate(c *gin.Context) {
return
}
run := runner.New(&runner.Config{
run, err := runner.New()
if err != nil {
c.JSON(http.StatusInternalServerError, simpleError(models.ErrNewRunnerDriver))
return
}
err = run.EnsureUsableImage(&runner.Config{
Ctx: ctx,
Route: wroute.Route,
})
err = run.EnsureUsableImage()
if err != nil {
c.JSON(http.StatusInternalServerError, simpleError(models.ErrUsableImage))
return