helper update for e2e

e2e/docker/docker_test.go

@@ -51,6 +51,8 @@ func runRegistry(t *testing.T) {
 	addr, port := findService(t, registryService)
 	address := fmt.Sprintf("%s:%d", addr, port)
 
+	t.Logf("Setting up insecure private registry at %v", address)
+
 	// run the sed job to fixup the auth.json file with correct address
 	_, sedCleanup := jobs3.Submit(t,
 		"../docker_registry/registry-auths.hcl",
@@ -72,7 +74,6 @@ func runRegistry(t *testing.T) {
 		jobs3.WaitComplete("create-conf"),
 		jobs3.Timeout(20*time.Second),
 	)
-
 	t.Cleanup(dockerInsecure)
 }
 

e2e/docker/input/docker_conf.hcl

@@ -33,11 +33,6 @@ job "docker-conf" {
   }
 
   group "create-conf" {
-    reschedule {
-      attempts  = 0
-      unlimited = false
-    }
-
     task "create-daemon-file" {
       driver = "pledge"
       user   = "${var.user}"
@@ -67,11 +62,11 @@ EOH
     }
 
     task "restart-docker" {
-      driver = "raw_exec" # FIXME: make it a pledge task in the future
+      driver = "raw_exec" # TODO: see if this could be done with pledge?
 
       config {
-        command = "systemctl"
-        args    = ["restart", "docker"]
+        command = "service"
+        args    = ["docker", "restart"]
       }
       resources {
         cpu    = 100

e2e/terraform/etc/nomad.d/client-linux.hcl

@@ -43,6 +43,10 @@ plugin "docker" {
     volumes {
       enabled = true
     }
+    auth {
+      helper = "test.sh"
+      config = "/etc/auth.json"
+    }
   }
 }