From e2226223e614716749cdb7701a130c7449f5f854 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 20 Jun 2016 17:44:45 -0700 Subject: [PATCH] Skip always pulling images on integration tests Signed-off-by: Tonis Tiigi --- .../cluster/executor/container/controller.go | 29 ++++++++++--------- integration-cli/daemon.go | 2 +- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/daemon/cluster/executor/container/controller.go b/daemon/cluster/executor/container/controller.go index efdd12ac3b..6856505b16 100644 --- a/daemon/cluster/executor/container/controller.go +++ b/daemon/cluster/executor/container/controller.go @@ -2,6 +2,7 @@ package container import ( "fmt" + "os" executorpkg "github.com/docker/docker/daemon/cluster/executor" "github.com/docker/engine-api/types" @@ -84,19 +85,21 @@ func (r *controller) Prepare(ctx context.Context) error { return err } - if err := r.adapter.pullImage(ctx); err != nil { - // NOTE(stevvooe): We always try to pull the image to make sure we have - // the most up to date version. This will return an error, but we only - // log it. If the image truly doesn't exist, the create below will - // error out. - // - // This gives us some nice behavior where we use up to date versions of - // mutable tags, but will still run if the old image is available but a - // registry is down. - // - // If you don't want this behavior, lock down your image to an - // immutable tag or digest. - log.G(ctx).WithError(err).Error("pulling image failed") + if os.Getenv("DOCKER_SERVICE_PREFER_OFFLINE_IMAGE") != "1" { + if err := r.adapter.pullImage(ctx); err != nil { + // NOTE(stevvooe): We always try to pull the image to make sure we have + // the most up to date version. This will return an error, but we only + // log it. If the image truly doesn't exist, the create below will + // error out. + // + // This gives us some nice behavior where we use up to date versions of + // mutable tags, but will still run if the old image is available but a + // registry is down. + // + // If you don't want this behavior, lock down your image to an + // immutable tag or digest. + log.G(ctx).WithError(err).Error("pulling image failed") + } } if err := r.adapter.create(ctx, r.backend); err != nil { diff --git a/integration-cli/daemon.go b/integration-cli/daemon.go index 9a7f07d564..f621d13fa2 100644 --- a/integration-cli/daemon.go +++ b/integration-cli/daemon.go @@ -172,7 +172,7 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error { args = append(args, providedArgs...) d.cmd = exec.Command(dockerdBinary, args...) - + d.cmd.Env = append(os.Environ(), "DOCKER_SERVICE_PREFER_OFFLINE_IMAGE=1") d.cmd.Stdout = out d.cmd.Stderr = out d.logFile = out