mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
updates after runner factored
This commit is contained in:
@@ -17,6 +17,7 @@ var (
|
|||||||
ErrAppsNothingToUpdate = errors.New("Nothing to update")
|
ErrAppsNothingToUpdate = errors.New("Nothing to update")
|
||||||
ErrAppsMissingNew = errors.New("Missing new application")
|
ErrAppsMissingNew = errors.New("Missing new application")
|
||||||
ErrUsableImage = errors.New("Image not found")
|
ErrUsableImage = errors.New("Image not found")
|
||||||
|
ErrNewRunnerDriver = errors.New("Error creating the runner driver")
|
||||||
)
|
)
|
||||||
|
|
||||||
type App struct {
|
type App struct {
|
||||||
|
|||||||
@@ -64,6 +64,20 @@ func (r *Runner) Run(ctx context.Context, cfg *Config) (drivers.RunResult, error
|
|||||||
return result, nil
|
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) {
|
func selectDriver(driver string, env *common.Environment, conf *driverscommon.Config) (drivers.Driver, error) {
|
||||||
switch driver {
|
switch driver {
|
||||||
case "docker":
|
case "docker":
|
||||||
|
|||||||
@@ -38,12 +38,17 @@ func handleRouteCreate(c *gin.Context) {
|
|||||||
return
|
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,
|
Ctx: ctx,
|
||||||
Route: wroute.Route,
|
Route: wroute.Route,
|
||||||
})
|
})
|
||||||
|
|
||||||
err = run.EnsureUsableImage()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, simpleError(models.ErrUsableImage))
|
c.JSON(http.StatusInternalServerError, simpleError(models.ErrUsableImage))
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user