Merge pull request #75 from Roblox/docker_registry

Set default docker registry.

Author: shishir-a412ed

containerd/containerd.go

@@ -29,6 +29,7 @@ import (
 	"github.com/containerd/containerd/cio"
 	"github.com/containerd/containerd/contrib/seccomp"
 	"github.com/containerd/containerd/oci"
+	refdocker "github.com/containerd/containerd/reference/docker"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 
@@ -66,7 +67,12 @@ func (d *Driver) pullImage(imageName string) (containerd.Image, error) {
 	ctxWithTimeout, cancel := context.WithTimeout(d.ctxContainerd, 90*time.Second)
 	defer cancel()
 
-	return d.client.Pull(ctxWithTimeout, imageName, containerd.WithPullUnpack)
+	named, err := refdocker.ParseDockerRef(imageName)
+	if err != nil {
+		return nil, err
+	}
+
+	return d.client.Pull(ctxWithTimeout, named.String(), containerd.WithPullUnpack)
 }
 
 func (d *Driver) createContainer(containerConfig *ContainerConfig, config *TaskConfig) (containerd.Container, error) {

example/capabilities.nomad

@@ -6,7 +6,7 @@ job "capabilities" {
       driver = "containerd-driver"
 
       config {
-        image           = "docker.io/library/ubuntu:16.04"
+        image           = "ubuntu:16.04"
         command         = "sleep"
         args            = ["600s"]
         readonly_rootfs = true

example/dns.nomad

@@ -15,7 +15,7 @@ job "dns" {
     task "dns-task" {
       driver = "containerd-driver"
       config {
-        image           = "docker.io/library/ubuntu:16.04"
+        image           = "ubuntu:16.04"
         command         = "sleep"
         args            = ["600s"]
       }

example/extra_hosts.nomad

@@ -5,7 +5,7 @@ job "extra_hosts" {
     task "extra_hosts-task" {
       driver = "containerd-driver"
       config {
-        image           = "docker.io/library/ubuntu:16.04"
+        image           = "ubuntu:16.04"
         extra_hosts     = ["postgres:127.0.1.1", "redis:127.0.1.2"]
         host_network    = true
         command         = "sleep"

example/hello.nomad

@@ -6,7 +6,7 @@ job "hello" {
       driver = "containerd-driver"
 
       config {
-        image = "docker.io/shm32/hello:world"
+        image = "shm32/hello:world"
       }
 
       resources {

example/privileged.nomad

@@ -6,7 +6,7 @@ job "privileged" {
       driver = "containerd-driver"
 
       config {
-        image           = "docker.io/library/ubuntu:16.04"
+        image           = "ubuntu:16.04"
         command         = "sleep"
         args            = ["600s"]
         privileged      = true

example/redis.nomad

@@ -6,7 +6,7 @@ job "redis" {
       driver = "containerd-driver"
 
       config {
-        image   = "docker.io/library/redis:alpine"
+        image   = "redis:alpine"
         seccomp = true
         cwd     = "/home/redis"
       }

example/signal.nomad

@@ -6,7 +6,7 @@ job "signal" {
       driver = "containerd-driver"
 
       config {
-        image = "docker.io/shm32/signal_handler:1.0"
+        image = "shm32/signal_handler:1.0"
       }
 
       resources {

example/stress.nomad

@@ -6,7 +6,7 @@ job "stress" {
       driver = "containerd-driver"
 
       config {
-        image = "docker.io/shm32/stress:1.0"
+        image = "shm32/stress:1.0"
       }
 
       restart {

example/volume_mount.nomad

@@ -18,7 +18,7 @@ job "volume_mount" {
     task "volume_mount-task" {
       driver = "containerd-driver"
       config {
-        image           = "docker.io/library/ubuntu:16.04"
+        image           = "ubuntu:16.04"
         command         = "sleep"
         args            = ["600s"]
       }