alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removed image check and mount docker socket in quickstart. (#531)

Browse Source
This commit is contained in:
Travis Reeder
2017-02-21 22:21:40 -08:00
committed by GitHub
parent b806e872ee
commit 24ed27bd74
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/server/routes_create.go
View File

@@ -7,7 +7,6 @@ import (
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api"
"github.com/iron-io/functions/api/models"
"github.com/iron-io/functions/api/runner/task"
"github.com/iron-io/runner/common"
)
@@ -44,13 +43,13 @@ func (s *Server) handleRouteCreate(c *gin.Context) {
return
}
err = s.Runner.EnsureImageExists(ctx, &task.Config{
Image: wroute.Route.Image,
})
if err != nil {
c.JSON(http.StatusBadRequest, simpleError(models.ErrUsableImage))
return
}
// err = s.Runner.EnsureImageExists(ctx, &task.Config{
// Image: wroute.Route.Image,
// })
// if err != nil {
// c.JSON(http.StatusBadRequest, simpleError(models.ErrUsableImage))
// return
// }
app, err := s.Datastore.GetApp(ctx, wroute.Route.AppName)
if err != nil && err != models.ErrAppsNotFound {

17
api/server/routes_update.go
View File

@@ -8,7 +8,6 @@ import (
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api"
"github.com/iron-io/functions/api/models"
"github.com/iron-io/functions/api/runner/task"
"github.com/iron-io/runner/common"
)
@@ -41,14 +40,14 @@ func (s *Server) handleRouteUpdate(c *gin.Context) {
wroute.Route.Path = path.Clean(c.MustGet(api.Path).(string))
if wroute.Route.Image != "" {
err = s.Runner.EnsureImageExists(ctx, &task.Config{
Image: wroute.Route.Image,
})
if err != nil {
log.WithError(err).Debug(models.ErrRoutesUpdate)
c.JSON(http.StatusBadRequest, simpleError(models.ErrUsableImage))
return
}
// err = s.Runner.EnsureImageExists(ctx, &task.Config{
// Image: wroute.Route.Image,
// })
// if err != nil {
// log.WithError(err).Debug(models.ErrRoutesUpdate)
// c.JSON(http.StatusBadRequest, simpleError(models.ErrUsableImage))
// return
// }
}
route, err := s.Datastore.UpdateRoute(ctx, wroute.Route)