docker: update images to reference hashicorpdev Docker organization (#…

…12903) docker: update images to reference hashicorpdev dockerhub organization generate job_init.bindata_assetfs.go Co-authored-by: Luiz Aoqui <luiz@hashicorp.com>
hashicorp · Jun 8, 2022 · e78a590 · e78a590
1 parent 7899fd3
commit e78a590
Show file tree

Hide file tree

Showing 23 changed files with 53 additions and 53 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -183,7 +183,7 @@ jobs:
             make deps
       - run:
           name: Pre-download docker test image
-          command: docker pull docker.mirror.hashicorp.services/hashicorpnomad/busybox-windows:server2016-0.1
+          command: docker pull docker.mirror.hashicorp.services/hashicorpdev/busybox-windows:server2016-0.1
       - run:
           name: Build nomad
           command: |

diff --git a/command/assets/connect-short.nomad b/command/assets/connect-short.nomad
@@ -19,7 +19,7 @@ job "countdash" {
       driver = "docker"
 
       config {
-        image          = "hashicorpnomad/counter-api:v3"
+        image          = "hashicorpdev/counter-api:v3"
         auth_soft_fail = true
       }
     }
@@ -59,7 +59,7 @@ job "countdash" {
       }
 
       config {
-        image          = "hashicorpnomad/counter-dashboard:v3"
+        image          = "hashicorpdev/counter-dashboard:v3"
         auth_soft_fail = true
       }
     }

diff --git a/command/assets/connect.nomad b/command/assets/connect.nomad
@@ -313,7 +313,7 @@ job "countdash" {
       # are specific to each driver, so please see specific driver
       # documentation for more information.
       config {
-        image = "hashicorpnomad/counter-api:v3"
+        image = "hashicorpdev/counter-api:v3"
 
         # The "auth_soft_fail" configuration instructs Nomad to try public
         # repositories if the task fails to authenticate when pulling images
@@ -462,7 +462,7 @@ job "countdash" {
       }
 
       config {
-        image          = "hashicorpnomad/counter-dashboard:v3"
+        image          = "hashicorpdev/counter-dashboard:v3"
         auth_soft_fail = true
       }
     }

diff --git a/command/job_init.bindata_assetfs.go b/command/job_init.bindata_assetfs.go
diff --git a/drivers/docker/docklog/docker_logger_test.go b/drivers/docker/docklog/docker_logger_test.go
@@ -22,7 +22,7 @@ func testContainerDetails() (image string, imageName string, imageTag string) {
 	tag := "1"
 
 	if runtime.GOOS == "windows" {
-		name = "hashicorpnomad/busybox-windows"
+		name = "hashicorpdev/busybox-windows"
 		tag = "server2016-0.1"
 	}
 

diff --git a/drivers/docker/driver_windows_test.go b/drivers/docker/driver_windows_test.go
@@ -12,7 +12,7 @@ import (
 func newTaskConfig(variant string, command []string) TaskConfig {
 	// busyboxImageID is an id of an image containing nanoserver windows and
 	// a busybox exe.
-	busyboxImageID := "hashicorpnomad/busybox-windows:server2016-0.1"
+	busyboxImageID := "hashicorpdev/busybox-windows:server2016-0.1"
 
 	if tu.IsCI() {
 		// In CI, use HashiCorp Mirror to avoid DockerHub rate limiting

diff --git a/e2e/connect/input/demo.nomad b/e2e/connect/input/demo.nomad
@@ -33,7 +33,7 @@ job "countdash" {
       driver = "docker"
 
       config {
-        image = "hashicorpnomad/counter-api:v3"
+        image = "hashicorpdev/counter-api:v3"
       }
     }
   }
@@ -72,7 +72,7 @@ job "countdash" {
       }
 
       config {
-        image = "hashicorpnomad/counter-dashboard:v3"
+        image = "hashicorpdev/counter-dashboard:v3"
       }
     }
   }

diff --git a/e2e/connect/input/expose-custom.nomad b/e2e/connect/input/expose-custom.nomad
@@ -39,7 +39,7 @@ job "expose-custom" {
       driver = "docker"
 
       config {
-        image = "hashicorpnomad/counter-api:v3"
+        image = "hashicorpdev/counter-api:v3"
       }
     }
   }

diff --git a/e2e/connect/input/ingress-gateway.nomad b/e2e/connect/input/ingress-gateway.nomad
@@ -75,7 +75,7 @@ job "ig-bridge-demo" {
       driver = "docker"
 
       config {
-        image        = "hashicorpnomad/uuid-api:v3"
+        image        = "hashicorpdev/uuid-api:v3"
         network_mode = "host"
       }
 

diff --git a/e2e/connect/input/multi-ingress.nomad b/e2e/connect/input/multi-ingress.nomad
@@ -98,7 +98,7 @@ job "multi-ingress" {
       driver = "docker"
 
       config {
-        image        = "hashicorpnomad/uuid-api:v5"
+        image        = "hashicorpdev/uuid-api:v5"
         network_mode = "host"
       }
 
@@ -128,7 +128,7 @@ job "multi-ingress" {
       driver = "docker"
 
       config {
-        image        = "hashicorpnomad/uuid-api:v5"
+        image        = "hashicorpdev/uuid-api:v5"
         network_mode = "host"
       }
 
@@ -158,7 +158,7 @@ job "multi-ingress" {
       driver = "docker"
 
       config {
-        image        = "hashicorpnomad/uuid-api:v5"
+        image        = "hashicorpdev/uuid-api:v5"
         network_mode = "host"
       }
 

diff --git a/e2e/connect/input/native-demo.nomad b/e2e/connect/input/native-demo.nomad
@@ -25,7 +25,7 @@ job "cn-demo" {
       driver = "docker"
 
       config {
-        image        = "hashicorpnomad/uuid-api:v5"
+        image        = "hashicorpdev/uuid-api:v5"
         network_mode = "host"
       }
 
@@ -57,7 +57,7 @@ job "cn-demo" {
       driver = "docker"
 
       config {
-        image        = "hashicorpnomad/uuid-fe:v5"
+        image        = "hashicorpdev/uuid-fe:v5"
         network_mode = "host"
       }
 
@@ -68,4 +68,4 @@ job "cn-demo" {
       }
     }
   }
-}
+}
diff --git a/e2e/connect/input/terminating-gateway.nomad b/e2e/connect/input/terminating-gateway.nomad
@@ -24,7 +24,7 @@ job "countdash-terminating" {
       driver = "docker"
 
       config {
-        image        = "hashicorpnomad/counter-api:v3"
+        image        = "hashicorpdev/counter-api:v3"
         network_mode = "host"
       }
     }
@@ -102,7 +102,7 @@ job "countdash-terminating" {
       }
 
       config {
-        image = "hashicorpnomad/counter-dashboard:v3"
+        image = "hashicorpdev/counter-dashboard:v3"
       }
     }
   }

diff --git a/e2e/consul/input/namespaces/connect_ingress.nomad b/e2e/consul/input/namespaces/connect_ingress.nomad
@@ -97,7 +97,7 @@ job "connect_ingress" {
       driver = "docker"
 
       config {
-        image        = "hashicorpnomad/uuid-api:v3"
+        image        = "hashicorpdev/uuid-api:v3"
         network_mode = "host"
       }
 
@@ -130,7 +130,7 @@ job "connect_ingress" {
       driver = "docker"
 
       config {
-        image        = "hashicorpnomad/uuid-api:v3"
+        image        = "hashicorpdev/uuid-api:v3"
         network_mode = "host"
       }
 

diff --git a/e2e/consul/input/namespaces/connect_sidecars.nomad b/e2e/consul/input/namespaces/connect_sidecars.nomad
@@ -39,7 +39,7 @@ job "connect_sidecars" {
       driver = "docker"
 
       config {
-        image = "hashicorpnomad/counter-api:v3"
+        image = "hashicorpdev/counter-api:v3"
       }
     }
   }
@@ -74,7 +74,7 @@ job "connect_sidecars" {
       driver = "docker"
 
       config {
-        image = "hashicorpnomad/counter-api:v3"
+        image = "hashicorpdev/counter-api:v3"
       }
     }
   }
@@ -118,7 +118,7 @@ job "connect_sidecars" {
       }
 
       config {
-        image = "hashicorpnomad/counter-dashboard:v3"
+        image = "hashicorpdev/counter-dashboard:v3"
       }
     }
   }
@@ -160,7 +160,7 @@ job "connect_sidecars" {
       }
 
       config {
-        image = "hashicorpnomad/counter-dashboard:v3"
+        image = "hashicorpdev/counter-dashboard:v3"
       }
     }
   }

diff --git a/e2e/consul/input/namespaces/connect_terminating.nomad b/e2e/consul/input/namespaces/connect_terminating.nomad
@@ -29,7 +29,7 @@ job "connect_terminating" {
       driver = "docker"
 
       config {
-        image        = "hashicorpnomad/counter-api:v3"
+        image        = "hashicorpdev/counter-api:v3"
         network_mode = "host"
       }
 
@@ -59,7 +59,7 @@ job "connect_terminating" {
       driver = "docker"
 
       config {
-        image        = "hashicorpnomad/counter-api:v3"
+        image        = "hashicorpdev/counter-api:v3"
         network_mode = "host"
       }
 
@@ -156,7 +156,7 @@ job "connect_terminating" {
       }
 
       config {
-        image = "hashicorpnomad/counter-dashboard:v3"
+        image = "hashicorpdev/counter-dashboard:v3"
       }
     }
   }
@@ -198,7 +198,7 @@ job "connect_terminating" {
       }
 
       config {
-        image = "hashicorpnomad/counter-dashboard:v3"
+        image = "hashicorpdev/counter-dashboard:v3"
       }
     }
   }

diff --git a/website/content/docs/integrations/consul-connect.mdx b/website/content/docs/integrations/consul-connect.mdx
@@ -182,7 +182,7 @@ job "countdash" {
       driver = "docker"
 
       config {
-        image = "hashicorpnomad/counter-api:v3"
+        image = "hashicorpdev/counter-api:v3"
       }
     }
   }
@@ -221,7 +221,7 @@ job "countdash" {
       }
 
       config {
-        image = "hashicorpnomad/counter-dashboard:v3"
+        image = "hashicorpdev/counter-dashboard:v3"
       }
     }
   }

diff --git a/website/content/docs/job-specification/connect.mdx b/website/content/docs/job-specification/connect.mdx
@@ -37,7 +37,7 @@ job "countdash" {
       driver = "docker"
 
       config {
-        image = "hashicorpnomad/counter-api:v3"
+        image = "hashicorpdev/counter-api:v3"
       }
     }
   }
@@ -143,7 +143,7 @@ job "countdash" {
       driver = "docker"
 
       config {
-        image = "hashicorpnomad/counter-api:v3"
+        image = "hashicorpdev/counter-api:v3"
       }
     }
   }
@@ -182,7 +182,7 @@ job "countdash" {
       }
 
       config {
-        image = "hashicorpnomad/counter-dashboard:v3"
+        image = "hashicorpdev/counter-dashboard:v3"
       }
     }
   }

diff --git a/website/content/docs/job-specification/expose.mdx b/website/content/docs/job-specification/expose.mdx
@@ -64,7 +64,7 @@ job "expose-check-example" {
       driver = "docker"
 
       config {
-        image = "hashicorpnomad/counter-api:v3"
+        image = "hashicorpdev/counter-api:v3"
       }
     }
   }
@@ -122,7 +122,7 @@ job "expose-example" {
       driver = "docker"
 
       config {
-        image = "hashicorpnomad/counter-api:v3"
+        image = "hashicorpdev/counter-api:v3"
       }
 
       # e.g. reference ${NOMAD_PORT_api_expose_healthcheck} for other uses

diff --git a/website/content/docs/job-specification/gateway.mdx b/website/content/docs/job-specification/gateway.mdx
@@ -315,7 +315,7 @@ job "ingress-demo" {
       driver = "docker"
 
       config {
-        image        = "hashicorpnomad/uuid-api:v5"
+        image        = "hashicorpdev/uuid-api:v5"
         network_mode = "host"
       }
 
@@ -358,7 +358,7 @@ job "countdash-terminating" {
       driver = "docker"
 
       config {
-        image        = "hashicorpnomad/counter-api:v3"
+        image        = "hashicorpdev/counter-api:v3"
         network_mode = "host"
       }
     }
@@ -444,7 +444,7 @@ job "countdash-terminating" {
       }
 
       config {
-        image = "hashicorpnomad/counter-dashboard:v3"
+        image = "hashicorpdev/counter-dashboard:v3"
       }
     }
   }
@@ -561,7 +561,7 @@ job "countdash-mesh-one" {
       }
 
       config {
-        image = "hashicorpnomad/counter-dashboard:v3"
+        image = "hashicorpdev/counter-dashboard:v3"
       }
     }
   }
@@ -638,7 +638,7 @@ job "countdash-mesh-two" {
       driver = "docker"
 
       config {
-        image = "hashicorpnomad/counter-api:v3"
+        image = "hashicorpdev/counter-api:v3"
       }
     }
   }

diff --git a/website/content/docs/job-specification/proxy.mdx b/website/content/docs/job-specification/proxy.mdx
@@ -41,7 +41,7 @@ job "countdash" {
       driver = "docker"
 
       config {
-        image = "hashicorpnomad/counter-api:v3"
+        image = "hashicorpdev/counter-api:v3"
       }
     }
   }

diff --git a/website/content/docs/job-specification/sidecar_service.mdx b/website/content/docs/job-specification/sidecar_service.mdx
@@ -37,7 +37,7 @@ job "countdash" {
       driver = "docker"
 
       config {
-        image = "hashicorpnomad/counter-api:v3"
+        image = "hashicorpdev/counter-api:v3"
       }
     }
   }

diff --git a/website/content/docs/job-specification/sidecar_task.mdx b/website/content/docs/job-specification/sidecar_task.mdx
@@ -45,7 +45,7 @@ job "countdash" {
       driver = "docker"
 
       config {
-        image = "hashicorpnomad/counter-api:v3"
+        image = "hashicorpdev/counter-api:v3"
       }
     }
   }