mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
@@ -157,7 +157,6 @@ func (r *Runner) Run(ctx context.Context, cfg *Config) (drivers.RunResult, error
|
||||
ctask := &containerTask{
|
||||
ctx: ctx,
|
||||
cfg: cfg,
|
||||
auth: &common.ConfigAuth{},
|
||||
canRun: make(chan bool),
|
||||
}
|
||||
|
||||
@@ -215,15 +214,11 @@ func (r *Runner) Run(ctx context.Context, cfg *Config) (drivers.RunResult, error
|
||||
|
||||
func (r Runner) EnsureImageExists(ctx context.Context, cfg *Config) error {
|
||||
ctask := &containerTask{
|
||||
cfg: cfg,
|
||||
auth: &common.ConfigAuth{},
|
||||
cfg: cfg,
|
||||
}
|
||||
|
||||
err := r.driver.EnsureImageExists(ctx, ctask)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
_, err := docker.CheckRegistry(ctask.Image(), ctask.DockerAuth())
|
||||
return err
|
||||
}
|
||||
|
||||
func selectDriver(driver string, env *common.Environment, conf *driverscommon.Config) (drivers.Driver, error) {
|
||||
|
||||
@@ -4,14 +4,12 @@ import (
|
||||
"context"
|
||||
"io"
|
||||
|
||||
dockercli "github.com/fsouza/go-dockerclient"
|
||||
"github.com/iron-io/runner/common"
|
||||
"github.com/fsouza/go-dockerclient"
|
||||
"github.com/iron-io/runner/drivers"
|
||||
)
|
||||
|
||||
type containerTask struct {
|
||||
ctx context.Context
|
||||
auth *common.ConfigAuth
|
||||
cfg *Config
|
||||
canRun chan bool
|
||||
}
|
||||
@@ -42,6 +40,5 @@ func (t *containerTask) WorkDir() string { return "" }
|
||||
func (t *containerTask) Close() {}
|
||||
func (t *containerTask) WriteStat(drivers.Stat) {}
|
||||
|
||||
func (t *containerTask) DockerAuth() []dockercli.AuthConfiguration {
|
||||
return t.auth.Auth(t.Image())
|
||||
}
|
||||
// FIXME: for now just use empty creds => public docker hub image
|
||||
func (t *containerTask) DockerAuth() docker.AuthConfiguration { return docker.AuthConfiguration{} }
|
||||
|
||||
Reference in New Issue
Block a user