@@ -11,5 +11,5 @@ VNDR_COMMIT=c56e082291115e369f77601f9c071dd0b87c7120

 BINDATA_COMMIT=a0ff2567cfb70903282db057e799fd826784d41d

 # CLI

-DOCKERCLI_REPO=https://github.com/dperny/cli

-DOCKERCLI_COMMIT=7230906e0e297999eb33da74e0279c5cf41a119e

+DOCKERCLI_REPO=https://github.com/docker/cli

+DOCKERCLI_COMMIT=3dfb8343b139d6342acfd9975d7f1068b5b1c3d3

@@ -46,7 +46,8 @@ func (s *DockerSwarmSuite) TestPruneNetwork(c *check.C) {

 	serviceName := "testprunesvc"

 	replicas := 1

-	out, err := d.Cmd("service", "create", "--name", serviceName,

+	out, err := d.Cmd("service", "create", "--no-resolve-image",

+		"--name", serviceName,

 		"--replicas", strconv.Itoa(replicas),

 		"--network", "n3",

 		"busybox", "top")

@@ -17,7 +17,7 @@ import (

 func (s *DockerSwarmSuite) TestServiceCreateMountVolume(c *check.C) {

 	d := s.AddDaemon(c, true, true)

-	out, err := d.Cmd("service", "create", "--detach=true", "--mount", "type=volume,source=foo,target=/foo,volume-nocopy", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--detach=true", "--mount", "type=volume,source=foo,target=/foo,volume-nocopy", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	id := strings.TrimSpace(out)

@@ -76,7 +76,7 @@ func (s *DockerSwarmSuite) TestServiceCreateWithSecretSimple(c *check.C) {

 	})

 	c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))

-	out, err := d.Cmd("service", "create", "--name", serviceName, "--secret", testName, "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", serviceName, "--secret", testName, "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", serviceName)

@@ -122,7 +122,7 @@ func (s *DockerSwarmSuite) TestServiceCreateWithSecretSourceTargetPaths(c *check

 	}

 	serviceName := "svc"

-	serviceCmd := []string{"service", "create", "--name", serviceName}

+	serviceCmd := []string{"service", "create", "--no-resolve-image", "--name", serviceName}

 	serviceCmd = append(serviceCmd, secretFlags...)

 	serviceCmd = append(serviceCmd, "busybox", "top")

 	out, err := d.Cmd(serviceCmd...)

@@ -175,7 +175,7 @@ func (s *DockerSwarmSuite) TestServiceCreateWithSecretReferencedTwice(c *check.C

 	c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))

 	serviceName := "svc"

-	out, err := d.Cmd("service", "create", "--name", serviceName, "--secret", "source=mysecret,target=target1", "--secret", "source=mysecret,target=target2", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", serviceName, "--secret", "source=mysecret,target=target1", "--secret", "source=mysecret,target=target2", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", serviceName)

@@ -224,7 +224,7 @@ func (s *DockerSwarmSuite) TestServiceCreateWithConfigSimple(c *check.C) {

 	})

 	c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("configs: %s", id))

-	out, err := d.Cmd("service", "create", "--name", serviceName, "--config", testName, "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", serviceName, "--config", testName, "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Configs }}", serviceName)

@@ -269,7 +269,7 @@ func (s *DockerSwarmSuite) TestServiceCreateWithConfigSourceTargetPaths(c *check

 	}

 	serviceName := "svc"

-	serviceCmd := []string{"service", "create", "--name", serviceName}

+	serviceCmd := []string{"service", "create", "--no-resolve-image", "--name", serviceName}

 	serviceCmd = append(serviceCmd, configFlags...)

 	serviceCmd = append(serviceCmd, "busybox", "top")

 	out, err := d.Cmd(serviceCmd...)

@@ -322,7 +322,7 @@ func (s *DockerSwarmSuite) TestServiceCreateWithConfigReferencedTwice(c *check.C

 	c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("configs: %s", id))

 	serviceName := "svc"

-	out, err := d.Cmd("service", "create", "--name", serviceName, "--config", "source=myconfig,target=target1", "--config", "source=myconfig,target=target2", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", serviceName, "--config", "source=myconfig,target=target1", "--config", "source=myconfig,target=target2", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Configs }}", serviceName)

@@ -360,7 +360,7 @@ func (s *DockerSwarmSuite) TestServiceCreateWithConfigReferencedTwice(c *check.C

 func (s *DockerSwarmSuite) TestServiceCreateMountTmpfs(c *check.C) {

 	d := s.AddDaemon(c, true, true)

-	out, err := d.Cmd("service", "create", "--detach=true", "--mount", "type=tmpfs,target=/foo,tmpfs-size=1MB", "busybox", "sh", "-c", "mount | grep foo; tail -f /dev/null")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--detach=true", "--mount", "type=tmpfs,target=/foo,tmpfs-size=1MB", "busybox", "sh", "-c", "mount | grep foo; tail -f /dev/null")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	id := strings.TrimSpace(out)

@@ -31,7 +31,7 @@ func (s *DockerSwarmSuite) TestServiceHealthRun(c *check.C) {

 	c.Check(err, check.IsNil)

 	serviceName := "healthServiceRun"

-	out, err := d.Cmd("service", "create", "--detach=true", "--name", serviceName, imageName, "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--detach=true", "--name", serviceName, imageName, "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	id := strings.TrimSpace(out)

@@ -92,7 +92,7 @@ func (s *DockerSwarmSuite) TestServiceHealthStart(c *check.C) {

 	c.Check(err, check.IsNil)

 	serviceName := "healthServiceStart"

-	out, err := d.Cmd("service", "create", "--detach=true", "--name", serviceName, imageName, "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--detach=true", "--name", serviceName, imageName, "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	id := strings.TrimSpace(out)

@@ -31,7 +31,7 @@ func (s *DockerSwarmSuite) TestServiceLogs(c *check.C) {

 	}

 	for name, message := range services {

-		out, err := d.Cmd("service", "create", "--name", name, "busybox",

+		out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name, "busybox",

 			"sh", "-c", fmt.Sprintf("echo %s; tail -f /dev/null", message))

 		c.Assert(err, checker.IsNil)

 		c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

@@ -74,7 +74,7 @@ func (s *DockerSwarmSuite) TestServiceLogsCompleteness(c *check.C) {

 	name := "TestServiceLogsCompleteness"

 	// make a service that prints 6 lines

-	out, err := d.Cmd("service", "create", "--name", name, "busybox", "sh", "-c", "for line in $(seq 0 5); do echo log test $line; done; sleep 100000")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name, "busybox", "sh", "-c", "for line in $(seq 0 5); do echo log test $line; done; sleep 100000")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

@@ -101,7 +101,7 @@ func (s *DockerSwarmSuite) TestServiceLogsTail(c *check.C) {

 	name := "TestServiceLogsTail"

 	// make a service that prints 6 lines

-	out, err := d.Cmd("service", "create", "--name", name, "busybox", "sh", "-c", "for line in $(seq 1 6); do echo log test $line; done; sleep 100000")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name, "busybox", "sh", "-c", "for line in $(seq 1 6); do echo log test $line; done; sleep 100000")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

@@ -125,7 +125,7 @@ func (s *DockerSwarmSuite) TestServiceLogsSince(c *check.C) {

 	name := "TestServiceLogsSince"

-	out, err := d.Cmd("service", "create", "--name", name, "busybox", "sh", "-c", "for i in $(seq 1 3); do sleep .1; echo log$i; done; sleep 10000000")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name, "busybox", "sh", "-c", "for i in $(seq 1 3); do sleep .1; echo log$i; done; sleep 10000000")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

 	waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 1)

@@ -159,7 +159,7 @@ func (s *DockerSwarmSuite) TestServiceLogsFollow(c *check.C) {

 	name := "TestServiceLogsFollow"

-	out, err := d.Cmd("service", "create", "--name", name, "busybox", "sh", "-c", "while true; do echo log test; sleep 0.1; done")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name, "busybox", "sh", "-c", "while true; do echo log test; sleep 0.1; done")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

@@ -207,7 +207,7 @@ func (s *DockerSwarmSuite) TestServiceLogsTaskLogs(c *check.C) {

 	result := icmd.RunCmd(d.Command(

 		// create a service with the name

-		"service", "create", "--name", name,

+		"service", "create", "--no-resolve-image", "--name", name,

 		// which has some number of replicas

 		fmt.Sprintf("--replicas=%v", replicas),

 		// which has this the task id as an environment variable templated in

@@ -259,7 +259,7 @@ func (s *DockerSwarmSuite) TestServiceLogsTTY(c *check.C) {

 	result := icmd.RunCmd(d.Command(

 		// create a service

-		"service", "create",

+		"service", "create", "--no-resolve-image",

 		// name it $name

 		"--name", name,

 		// use a TTY

@@ -297,7 +297,7 @@ func (s *DockerSwarmSuite) TestServiceLogsNoHangDeletedContainer(c *check.C) {

 	result := icmd.RunCmd(d.Command(

 		// create a service

-		"service", "create",

+		"service", "create", "--no-resolve-image",

 		// name it $name

 		"--name", name,

 		// busybox image, shell string

@@ -346,7 +346,7 @@ func (s *DockerSwarmSuite) TestServiceLogsDetails(c *check.C) {

 	result := icmd.RunCmd(d.Command(

 		// create a service

-		"service", "create",

+		"service", "create", "--no-resolve-image",

 		// name it $name

 		"--name", name,

 		// add an environment variable

@@ -14,11 +14,11 @@ func (s *DockerSwarmSuite) TestServiceScale(c *check.C) {

 	d := s.AddDaemon(c, true, true)

 	service1Name := "TestService1"

-	service1Args := append([]string{"service", "create", "--name", service1Name, defaultSleepImage}, sleepCommandForDaemonPlatform()...)

+	service1Args := append([]string{"service", "create", "--no-resolve-image", "--name", service1Name, defaultSleepImage}, sleepCommandForDaemonPlatform()...)

 	// global mode

 	service2Name := "TestService2"

-	service2Args := append([]string{"service", "create", "--name", service2Name, "--mode=global", defaultSleepImage}, sleepCommandForDaemonPlatform()...)

+	service2Args := append([]string{"service", "create", "--no-resolve-image", "--name", service2Name, "--mode=global", defaultSleepImage}, sleepCommandForDaemonPlatform()...)

 	// Create services

 	out, err := d.Cmd(service1Args...)

@@ -15,7 +15,7 @@ func (s *DockerSwarmSuite) TestServiceUpdatePort(c *check.C) {

 	d := s.AddDaemon(c, true, true)

 	serviceName := "TestServiceUpdatePort"

-	serviceArgs := append([]string{"service", "create", "--name", serviceName, "-p", "8080:8081", defaultSleepImage}, sleepCommandForDaemonPlatform()...)

+	serviceArgs := append([]string{"service", "create", "--no-resolve-image", "--name", serviceName, "-p", "8080:8081", defaultSleepImage}, sleepCommandForDaemonPlatform()...)

 	// Create a service with a port mapping of 8080:8081.

 	out, err := d.Cmd(serviceArgs...)

@@ -48,7 +48,7 @@ func (s *DockerSwarmSuite) TestServiceUpdatePort(c *check.C) {

 func (s *DockerSwarmSuite) TestServiceUpdateLabel(c *check.C) {

 	d := s.AddDaemon(c, true, true)

-	out, err := d.Cmd("service", "create", "--name=test", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name=test", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	service := d.GetService(c, "test")

 	c.Assert(service.Spec.Labels, checker.HasLen, 0)

@@ -100,7 +100,7 @@ func (s *DockerSwarmSuite) TestServiceUpdateSecrets(c *check.C) {

 	testTarget := "testing"

 	serviceName := "test"

-	out, err := d.Cmd("service", "create", "--name", serviceName, "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", serviceName, "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	// add secret

@@ -142,7 +142,7 @@ func (s *DockerSwarmSuite) TestServiceUpdateConfigs(c *check.C) {

 	testTarget := "/testing"

 	serviceName := "test"

-	out, err := d.Cmd("service", "create", "--name", serviceName, "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", serviceName, "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	// add config

@@ -169,7 +169,7 @@ func (s *DockerSwarmSuite) TestSwarmIncompatibleDaemon(c *check.C) {

 func (s *DockerSwarmSuite) TestSwarmServiceTemplatingHostname(c *check.C) {

 	d := s.AddDaemon(c, true, true)

-	out, err := d.Cmd("service", "create", "--name", "test", "--hostname", "{{.Service.Name}}-{{.Task.Slot}}", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", "test", "--hostname", "{{.Service.Name}}-{{.Task.Slot}}", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	// make sure task has been deployed.

@@ -188,15 +188,15 @@ func (s *DockerSwarmSuite) TestSwarmServiceListFilter(c *check.C) {

 	name1 := "redis-cluster-md5"

 	name2 := "redis-cluster"

 	name3 := "other-cluster"

-	out, err := d.Cmd("service", "create", "--name", name1, "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name1, "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

-	out, err = d.Cmd("service", "create", "--name", name2, "busybox", "top")

+	out, err = d.Cmd("service", "create", "--no-resolve-image", "--name", name2, "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

-	out, err = d.Cmd("service", "create", "--name", name3, "busybox", "top")

+	out, err = d.Cmd("service", "create", "--no-resolve-image", "--name", name3, "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

@@ -246,7 +246,7 @@ func (s *DockerSwarmSuite) TestSwarmNodeTaskListFilter(c *check.C) {

 	d := s.AddDaemon(c, true, true)

 	name := "redis-cluster-md5"

-	out, err := d.Cmd("service", "create", "--name", name, "--replicas=3", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name, "--replicas=3", "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

@@ -273,7 +273,7 @@ func (s *DockerSwarmSuite) TestSwarmPublishAdd(c *check.C) {

 	d := s.AddDaemon(c, true, true)

 	name := "top"

-	out, err := d.Cmd("service", "create", "--name", name, "--label", "x=y", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name, "--label", "x=y", "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

@@ -295,7 +295,7 @@ func (s *DockerSwarmSuite) TestSwarmServiceWithGroup(c *check.C) {

 	d := s.AddDaemon(c, true, true)

 	name := "top"

-	out, err := d.Cmd("service", "create", "--name", name, "--user", "root:root", "--group", "wheel", "--group", "audio", "--group", "staff", "--group", "777", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name, "--user", "root:root", "--group", "wheel", "--group", "audio", "--group", "staff", "--group", "777", "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

@@ -481,7 +481,7 @@ func (s *DockerSwarmSuite) TestSwarmIngressNetwork(c *check.C) {

 	c.Assert(strings.TrimSpace(out), checker.Contains, "is already present")

 	// It cannot be removed if it is being used

-	out, err = d.Cmd("service", "create", "--name", "srv1", "-p", "9000:8000", "busybox", "top")

+	out, err = d.Cmd("service", "create", "--no-resolve-image", "--name", "srv1", "-p", "9000:8000", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	out, _, err = testutil.RunCommandPipelineWithOutput(

 		exec.Command("echo", "Y"),

@@ -500,7 +500,7 @@ func (s *DockerSwarmSuite) TestSwarmIngressNetwork(c *check.C) {

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	// A service which needs the ingress network cannot be created if no ingress is present

-	out, err = d.Cmd("service", "create", "--name", "srv2", "-p", "500:500", "busybox", "top")

+	out, err = d.Cmd("service", "create", "--no-resolve-image", "--name", "srv2", "-p", "500:500", "busybox", "top")

 	c.Assert(err, checker.NotNil)

 	c.Assert(strings.TrimSpace(out), checker.Contains, "no ingress network is present")

@@ -510,7 +510,7 @@ func (s *DockerSwarmSuite) TestSwarmIngressNetwork(c *check.C) {

 	c.Assert(strings.TrimSpace(out), checker.Contains, "no ingress network is present")

 	// But services which do not need routing mesh can be created regardless

-	out, err = d.Cmd("service", "create", "--name", "srv3", "--endpoint-mode", "dnsrr", "busybox", "top")

+	out, err = d.Cmd("service", "create", "--no-resolve-image", "--name", "srv3", "--endpoint-mode", "dnsrr", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 }

@@ -528,7 +528,7 @@ func (s *DockerSwarmSuite) TestSwarmCreateServiceWithNoIngressNetwork(c *check.C

 	// Make sure nothing panics because ingress network is missing

 	out, err = d.Cmd("network", "create", "-d", "overlay", "another-network")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

-	out, err = d.Cmd("service", "create", "--name", "srv4", "--network", "another-network", "busybox", "top")

+	out, err = d.Cmd("service", "create", "--no-resolve-image", "--name", "srv4", "--network", "another-network", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 }

@@ -538,7 +538,7 @@ func (s *DockerSwarmSuite) TestSwarmTaskListFilter(c *check.C) {

 	d := s.AddDaemon(c, true, true)

 	name := "redis-cluster-md5"

-	out, err := d.Cmd("service", "create", "--name", name, "--replicas=3", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name, "--replicas=3", "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

@@ -572,7 +572,7 @@ func (s *DockerSwarmSuite) TestSwarmTaskListFilter(c *check.C) {

 	c.Assert(out, checker.Not(checker.Contains), name+".3")

 	name = "redis-cluster-sha1"

-	out, err = d.Cmd("service", "create", "--name", name, "--mode=global", "busybox", "top")

+	out, err = d.Cmd("service", "create", "--no-resolve-image", "--name", name, "--mode=global", "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

@@ -601,7 +601,7 @@ func (s *DockerSwarmSuite) TestPsListContainersFilterIsTask(c *check.C) {

 	bareID := strings.TrimSpace(out)[:12]

 	// Create a service

 	name := "busybox-top"

-	out, err = d.Cmd("service", "create", "--name", name, "busybox", "top")

+	out, err = d.Cmd("service", "create", "--no-resolve-image", "--name", name, "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

@@ -820,7 +820,7 @@ func (s *DockerSwarmSuite) TestSwarmServiceEnvFile(c *check.C) {

 	c.Assert(err, checker.IsNil)

 	name := "worker"

-	out, err := d.Cmd("service", "create", "--env-file", path, "--env", "VAR1=B", "--env", "VAR1=C", "--env", "VAR2=", "--env", "VAR2", "--name", name, "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--env-file", path, "--env", "VAR1=B", "--env", "VAR1=C", "--env", "VAR2=", "--env", "VAR2", "--name", name, "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

@@ -839,7 +839,7 @@ func (s *DockerSwarmSuite) TestSwarmServiceTTY(c *check.C) {

 	// Without --tty

 	expectedOutput := "none"

-	out, err := d.Cmd("service", "create", "--name", name, "busybox", "sh", "-c", ttyCheck)

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name, "busybox", "sh", "-c", ttyCheck)

 	c.Assert(err, checker.IsNil)

 	// Make sure task has been deployed.

@@ -862,7 +862,7 @@ func (s *DockerSwarmSuite) TestSwarmServiceTTY(c *check.C) {

 	// With --tty

 	expectedOutput = "TTY"

-	out, err = d.Cmd("service", "create", "--name", name, "--tty", "busybox", "sh", "-c", ttyCheck)

+	out, err = d.Cmd("service", "create", "--no-resolve-image", "--name", name, "--tty", "busybox", "sh", "-c", ttyCheck)

 	c.Assert(err, checker.IsNil)

 	// Make sure task has been deployed.

@@ -883,7 +883,7 @@ func (s *DockerSwarmSuite) TestSwarmServiceTTYUpdate(c *check.C) {

 	// Create a service

 	name := "top"

-	_, err := d.Cmd("service", "create", "--name", name, "busybox", "top")

+	_, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name, "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	// Make sure task has been deployed.

@@ -918,7 +918,7 @@ func (s *DockerSwarmSuite) TestSwarmServiceNetworkUpdate(c *check.C) {

 	// Create a service

 	name := "top"

-	result = icmd.RunCmd(d.Command("service", "create", "--network", "foo", "--network", "bar", "--name", name, "busybox", "top"))

+	result = icmd.RunCmd(d.Command("service", "create", "--no-resolve-image", "--network", "foo", "--network", "bar", "--name", name, "busybox", "top"))

 	result.Assert(c, icmd.Success)

 	// Make sure task has been deployed.

@@ -945,7 +945,7 @@ func (s *DockerSwarmSuite) TestDNSConfig(c *check.C) {

 	// Create a service

 	name := "top"

-	_, err := d.Cmd("service", "create", "--name", name, "--dns=1.2.3.4", "--dns-search=example.com", "--dns-option=timeout:3", "busybox", "top")

+	_, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name, "--dns=1.2.3.4", "--dns-search=example.com", "--dns-option=timeout:3", "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	// Make sure task has been deployed.

@@ -972,7 +972,7 @@ func (s *DockerSwarmSuite) TestDNSConfigUpdate(c *check.C) {

 	// Create a service

 	name := "top"

-	_, err := d.Cmd("service", "create", "--name", name, "busybox", "top")

+	_, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name, "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	// Make sure task has been deployed.

@@ -1491,7 +1491,7 @@ func (s *DockerSwarmSuite) TestExtraHosts(c *check.C) {

 	// Create a service

 	name := "top"

-	_, err := d.Cmd("service", "create", "--name", name, "--host=example.com:1.2.3.4", "busybox", "top")

+	_, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name, "--host=example.com:1.2.3.4", "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	// Make sure task has been deployed.

@@ -1534,7 +1534,7 @@ func (s *DockerSwarmSuite) TestSwarmServiceInspectPretty(c *check.C) {

 	d := s.AddDaemon(c, true, true)

 	name := "top"

-	out, err := d.Cmd("service", "create", "--name", name, "--limit-cpu=0.5", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", name, "--limit-cpu=0.5", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	expectedOutput := `

@@ -1557,7 +1557,7 @@ func (s *DockerSwarmSuite) TestSwarmNetworkIPAMOptions(c *check.C) {

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	c.Assert(strings.TrimSpace(out), checker.Equals, "map[foo:bar]")

-	out, err = d.Cmd("service", "create", "--network=foo", "--name", "top", "busybox", "top")

+	out, err = d.Cmd("service", "create", "--no-resolve-image", "--network=foo", "--name", "top", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	// make sure task has been deployed.

@@ -1575,7 +1575,7 @@ func (s *DockerTrustedSwarmSuite) TestTrustedServiceCreate(c *check.C) {

 	repoName := s.trustSuite.setupTrustedImage(c, "trusted-pull")

 	name := "trusted"

-	cli.Docker(cli.Args("-D", "service", "create", "--name", name, repoName, "top"), trustedCmd, cli.Daemon(d.Daemon)).Assert(c, icmd.Expected{

+	cli.Docker(cli.Args("-D", "service", "create", "--no-resolve-image", "--name", name, repoName, "top"), trustedCmd, cli.Daemon(d.Daemon)).Assert(c, icmd.Expected{

 		Err: "resolved image tag to",

 	})

@@ -1592,7 +1592,7 @@ func (s *DockerTrustedSwarmSuite) TestTrustedServiceCreate(c *check.C) {

 	cli.DockerCmd(c, "rmi", repoName)

 	name = "untrusted"

-	cli.Docker(cli.Args("service", "create", "--name", name, repoName, "top"), trustedCmd, cli.Daemon(d.Daemon)).Assert(c, icmd.Expected{

+	cli.Docker(cli.Args("service", "create", "--no-resolve-image", "--name", name, repoName, "top"), trustedCmd, cli.Daemon(d.Daemon)).Assert(c, icmd.Expected{

 		ExitCode: 1,

 		Err:      "Error: remote trust data does not exist",

 	})

@@ -1610,7 +1610,7 @@ func (s *DockerTrustedSwarmSuite) TestTrustedServiceUpdate(c *check.C) {

 	name := "myservice"

 	// Create a service without content trust

-	cli.Docker(cli.Args("service", "create", "--name", name, repoName, "top"), cli.Daemon(d.Daemon)).Assert(c, icmd.Success)

+	cli.Docker(cli.Args("service", "create", "--no-resolve-image", "--name", name, repoName, "top"), cli.Daemon(d.Daemon)).Assert(c, icmd.Success)

 	result := cli.Docker(cli.Args("service", "inspect", "--pretty", name), cli.Daemon(d.Daemon))

 	c.Assert(result.Error, checker.IsNil, check.Commentf(result.Combined()))

@@ -1618,7 +1618,7 @@ func (s *DockerTrustedSwarmSuite) TestTrustedServiceUpdate(c *check.C) {

 	// DOCKER_SERVICE_PREFER_OFFLINE_IMAGE.

 	c.Assert(result.Combined(), check.Not(checker.Contains), repoName+"@", check.Commentf(result.Combined()))

-	cli.Docker(cli.Args("-D", "service", "update", "--image", repoName, name), trustedCmd, cli.Daemon(d.Daemon)).Assert(c, icmd.Expected{

+	cli.Docker(cli.Args("-D", "service", "update", "--no-resolve-image", "--image", repoName, name), trustedCmd, cli.Daemon(d.Daemon)).Assert(c, icmd.Expected{

 		Err: "resolved image tag to",

 	})

@@ -1634,7 +1634,7 @@ func (s *DockerTrustedSwarmSuite) TestTrustedServiceUpdate(c *check.C) {

 	cli.DockerCmd(c, "push", repoName)

 	cli.DockerCmd(c, "rmi", repoName)

-	cli.Docker(cli.Args("service", "update", "--image", repoName, name), trustedCmd, cli.Daemon(d.Daemon)).Assert(c, icmd.Expected{

+	cli.Docker(cli.Args("service", "update", "--no-resolve-image", "--image", repoName, name), trustedCmd, cli.Daemon(d.Daemon)).Assert(c, icmd.Expected{

 		ExitCode: 1,

 		Err:      "Error: remote trust data does not exist",

 	})

@@ -1691,13 +1691,13 @@ func (s *DockerSwarmSuite) TestSwarmServicePsMultipleServiceIDs(c *check.C) {

 	d := s.AddDaemon(c, true, true)

 	name1 := "top1"

-	out, err := d.Cmd("service", "create", "--detach=true", "--name", name1, "--replicas=3", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--detach=true", "--name", name1, "--replicas=3", "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

 	id1 := strings.TrimSpace(out)

 	name2 := "top2"

-	out, err = d.Cmd("service", "create", "--detach=true", "--name", name2, "--replicas=3", "busybox", "top")

+	out, err = d.Cmd("service", "create", "--no-resolve-image", "--detach=true", "--name", name2, "--replicas=3", "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

 	id2 := strings.TrimSpace(out)

@@ -1760,7 +1760,7 @@ func (s *DockerSwarmSuite) TestSwarmServicePsMultipleServiceIDs(c *check.C) {

 func (s *DockerSwarmSuite) TestSwarmPublishDuplicatePorts(c *check.C) {

 	d := s.AddDaemon(c, true, true)

-	out, err := d.Cmd("service", "create", "--detach=true", "--publish", "5005:80", "--publish", "5006:80", "--publish", "80", "--publish", "80", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--detach=true", "--publish", "5005:80", "--publish", "5006:80", "--publish", "80", "--publish", "80", "busybox", "top")

 	c.Assert(err, check.IsNil, check.Commentf(out))

 	id := strings.TrimSpace(out)

@@ -1820,7 +1820,7 @@ func (s *DockerSwarmSuite) TestSwarmReadonlyRootfs(c *check.C) {

 	d := s.AddDaemon(c, true, true)

-	out, err := d.Cmd("service", "create", "--name", "top", "--read-only", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", "top", "--read-only", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	// make sure task has been deployed.

@@ -1915,7 +1915,7 @@ func (s *DockerSwarmSuite) TestSwarmStopSignal(c *check.C) {

 	d := s.AddDaemon(c, true, true)

-	out, err := d.Cmd("service", "create", "--name", "top", "--stop-signal=SIGHUP", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", "top", "--stop-signal=SIGHUP", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	// make sure task has been deployed.

@@ -1941,11 +1941,11 @@ func (s *DockerSwarmSuite) TestSwarmStopSignal(c *check.C) {

 func (s *DockerSwarmSuite) TestSwarmServiceLsFilterMode(c *check.C) {

 	d := s.AddDaemon(c, true, true)

-	out, err := d.Cmd("service", "create", "--name", "top1", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", "top1", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

-	out, err = d.Cmd("service", "create", "--name", "top2", "--mode=global", "busybox", "top")

+	out, err = d.Cmd("service", "create", "--no-resolve-image", "--name", "top2", "--mode=global", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

@@ -2034,7 +2034,7 @@ func (s *DockerSwarmSuite) TestSwarmClusterEventsScope(c *check.C) {

 	d := s.AddDaemon(c, true, true)

 	// create a service

-	out, err := d.Cmd("service", "create", "--name", "test", "--detach=false", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", "test", "--detach=false", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	serviceID := strings.Split(out, "\n")[0]

@@ -2062,7 +2062,7 @@ func (s *DockerSwarmSuite) TestSwarmClusterEventsType(c *check.C) {

 	d := s.AddDaemon(c, true, true)

 	// create a service

-	out, err := d.Cmd("service", "create", "--name", "test", "--detach=false", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", "test", "--detach=false", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	serviceID := strings.Split(out, "\n")[0]

@@ -2090,7 +2090,7 @@ func (s *DockerSwarmSuite) TestSwarmClusterEventsService(c *check.C) {

 	d := s.AddDaemon(c, true, true)

 	// create a service

-	out, err := d.Cmd("service", "create", "--name", "test", "--detach=false", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--name", "test", "--detach=false", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	serviceID := strings.Split(out, "\n")[0]

@@ -15,7 +15,7 @@ import (

 func (s *DockerSwarmSuite) TestSwarmVolumePlugin(c *check.C) {

 	d := s.AddDaemon(c, true, true)

-	out, err := d.Cmd("service", "create", "--mount", "type=volume,source=my-volume,destination=/foo,volume-driver=customvolumedriver", "--name", "top", "busybox", "top")

+	out, err := d.Cmd("service", "create", "--no-resolve-image", "--mount", "type=volume,source=my-volume,destination=/foo,volume-driver=customvolumedriver", "--name", "top", "busybox", "top")

 	c.Assert(err, checker.IsNil, check.Commentf(out))

 	// Make sure task stays pending before plugin is available

@@ -74,7 +74,7 @@ func (s *DockerSwarmSuite) TestSwarmNetworkPluginV2(c *check.C) {

 	// create a global service to ensure that both nodes will have an instance

 	serviceName := "my-service"

-	_, err = d1.Cmd("service", "create", "--name", serviceName, "--mode=global", "--network", networkName, "busybox", "top")

+	_, err = d1.Cmd("service", "create", "--no-resolve-image", "--name", serviceName, "--mode=global", "--network", networkName, "busybox", "top")

 	c.Assert(err, checker.IsNil)

 	// wait for tasks ready

@@ -96,7 +96,7 @@ func (s *DockerSwarmSuite) TestSwarmNetworkPluginV2(c *check.C) {

 	image := "busybox"

 	// create a new global service again.

-	_, err = d1.Cmd("service", "create", "--name", serviceName, "--mode=global", "--network", networkName, image, "top")

+	_, err = d1.Cmd("service", "create", "--no-resolve-image", "--name", serviceName, "--mode=global", "--network", networkName, image, "top")

 	c.Assert(err, checker.IsNil)

 	waitAndAssert(c, defaultReconciliationTimeout, d1.CheckRunningTaskImages, checker.DeepEquals,