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

Fixed up build and updated dependencies.

Browse Source
This commit is contained in:
Travis Reeder
2017-05-15 15:40:36 -07:00
parent 2b01ae3616
commit 7cfd7d413f
25 changed files with 539 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/runner/drivers/docker/docker.go
View File

@@ -627,7 +627,7 @@ func (drv *DockerDriver) status(ctx context.Context, container string) (status s
if !cinfo.State.OOMKilled {
// It is possible that the host itself is running out of memory and
// the host kernel killed one of the container processes.
// See: https://github.com/docker/docker/issues/15621
// See: https://github.com/moby/moby/issues/15621
// TODO reed: isn't an OOM an OOM? this is wasting space imo
log.WithFields(logrus.Fields{"container": container}).Info("Setting task as OOM killed, but docker disagreed.")
drv.Inc("docker", "possible_oom_false_alarm", 1, 1.0)

4
api/runner/drivers/driver.go
View File

@@ -262,9 +262,9 @@ func parseRepositoryTag(repoTag string) (repository string, tag string) {
func ParseImage(image string) (registry, repo, tag string) {
repo, tag = parseRepositoryTag(image)
// Officially sanctioned at https://github.com/docker/docker/blob/master/registry/session.go#L319 to deal with "Official Repositories".
// Officially sanctioned at https://github.com/moby/moby/blob/master/registry/session.go#L319 to deal with "Official Repositories".
// Without this, token auth fails.
// Registries must exist at root (https://github.com/docker/docker/issues/7067#issuecomment-54302847)
// Registries must exist at root (https://github.com/moby/moby/issues/7067#issuecomment-54302847)
// This cannot support the `library/` shortcut for private registries.
parts := strings.Split(repo, "/")
switch len(parts) {

2
api/runner/task.go
View File

@@ -9,7 +9,7 @@ import (
"path/filepath"
"time"
"github.com/docker/docker/cli/config/configfile"
"github.com/moby/moby/cli/config/configfile"
docker "github.com/fsouza/go-dockerclient"
"github.com/treeder/functions/api/runner/task"
"github.com/treeder/functions/api/runner/drivers"