kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-08 19:35:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #893 from hashicorp/docker-fingerprint

Browse Source 
Making the docker fingerprinter periodic
This commit is contained in:
Diptanu Choudhury
2016-03-08 14:06:57 -08:00
parent f4b4034137 fa6707ae5c
commit f01a94c5fd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/driver/docker.go
View File

@@ -22,7 +22,6 @@ import (
"github.com/hashicorp/nomad/client/config"
"github.com/hashicorp/nomad/client/driver/logging"
cstructs "github.com/hashicorp/nomad/client/driver/structs"
"github.com/hashicorp/nomad/client/fingerprint"
"github.com/hashicorp/nomad/helper/discover"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/mitchellh/mapstructure"
@@ -42,7 +41,6 @@ const (
type DockerDriver struct {
DriverContext
fingerprint.StaticFingerprinter
}
type DockerDriverAuth struct {
@@ -415,6 +413,10 @@ func (d *DockerDriver) recoverablePullError(err error, image string) error {
return cstructs.NewRecoverableError(fmt.Errorf("Failed to pull `%s`: %s", image, err), recoverable)
}
func (d *DockerDriver) Periodic() (bool, time.Duration) {
return true, 15 * time.Second
}
func (d *DockerDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, error) {
var driverConfig DockerDriverConfig
if err := mapstructure.WeakDecode(task.Config, &driverConfig); err != nil {