Make contrib a top-level directory.

WORKSPACE

@@ -34,23 +34,23 @@ docker_pull(
 
 # Have the py_image dependencies for testing.
 load(
-    "//docker/contrib/python:image.bzl",
+    "//contrib/python:image.bzl",
     _py_image_repos = "repositories",
 )
 
 _py_image_repos()
 
 # Have the cc_image dependencies for testing.
 load(
-    "//docker/contrib/cc:image.bzl",
+    "//contrib/cc:image.bzl",
     _cc_image_repos = "repositories",
 )
 
 _cc_image_repos()
 
 # Have the java_image dependencies for testing.
 load(
-    "//docker/contrib/java:image.bzl",
+    "//contrib/java:image.bzl",
     _java_image_repos = "repositories",
 )
 
@@ -76,7 +76,7 @@ go_repositories()
 
 # Have the go_image dependencies for testing.
 load(
-    "//docker/contrib/go:image.bzl",
+    "//contrib/go:image.bzl",
     _go_image_repos = "repositories",
 )
 

docker/contrib/cc/image.bzl → contrib/cc/image.bzl

@@ -17,7 +17,7 @@ The signature of this rule is compatible with cc_binary.
 """
 
 load(
-    "//docker/contrib/common:lang-image.bzl",
+    "//contrib/common:lang-image.bzl",
     "dep_layer",
     "app_layer",
 )

docker/contrib/go/image.bzl → contrib/go/image.bzl

@@ -17,7 +17,7 @@ The signature of this rule is compatible with go_binary.
 """
 
 load(
-    "//docker/contrib/common:lang-image.bzl",
+    "//contrib/common:lang-image.bzl",
     "dep_layer",
     "app_layer",
 )

docker/contrib/java/image.bzl → contrib/java/image.bzl

@@ -57,7 +57,7 @@ def java_files(f):
   return []
 
 load(
-    "//docker/contrib/common:lang-image.bzl",
+    "//contrib/common:lang-image.bzl",
     "dep_layer_impl",
     "layer_file_path",
 )

docker/contrib/push-all.bzl → contrib/push-all.bzl

@@ -106,7 +106,7 @@ container_push = rule(
             ],
         ),
         "_all_tpl": attr.label(
-            default = Label("//docker/contrib:push-all.sh.tpl"),
+            default = Label("//contrib:push-all.sh.tpl"),
             single_file = True,
             allow_files = True,
         ),

docker/contrib/python/image.bzl → contrib/python/image.bzl

@@ -17,7 +17,7 @@ The signature of this rule is compatible with py_binary.
 """
 
 load(
-    "//docker/contrib/common:lang-image.bzl",
+    "//contrib/common:lang-image.bzl",
     "dep_layer",
     "app_layer",
 )

docker/testdata/BUILD

@@ -370,7 +370,7 @@ genrule(
 # )
 
 load(
-    "//docker/contrib:with-tag.bzl",
+    "//contrib:with-tag.bzl",
     docker_build_with_tag = "docker_build",
 )
 
@@ -382,7 +382,7 @@ docker_build_with_tag(
 )
 
 load(
-    "//docker/contrib:push-all.bzl",
+    "//contrib:push-all.bzl",
     docker_pushall = "docker_push",
     oci_pushall = "oci_push",
 )
@@ -409,7 +409,7 @@ oci_pushall(
     bundle = ":bundle_to_push",
 )
 
-load("//docker/contrib:passwd.bzl", "passwd_file")
+load("//contrib:passwd.bzl", "passwd_file")
 
 passwd_file(
     name = "testpasswd",
@@ -472,7 +472,7 @@ docker_import(
 )
 
 load(
-    "//docker/contrib/python:image.bzl",
+    "//contrib/python:image.bzl",
     "py_image",
 )
 
@@ -491,7 +491,7 @@ py_image(
 )
 
 load(
-    "//docker/contrib/cc:image.bzl",
+    "//contrib/cc:image.bzl",
     "cc_image",
 )
 
@@ -509,7 +509,7 @@ cc_image(
 )
 
 load(
-    "//docker/contrib/java:image.bzl",
+    "//contrib/java:image.bzl",
     "java_image",
     "war_image",
 )
@@ -550,7 +550,7 @@ war_image(
 )
 
 load(
-    "//docker/contrib/go:image.bzl",
+    "//contrib/go:image.bzl",
     "go_image",
 )
 

testing/e2e.sh

@@ -98,7 +98,7 @@ function clear_docker() {
 
 function test_bazel_build_then_run_docker_build_clean() {
   cd "${ROOT}"
-  for target in $(bazel query 'kind("docker_build", "docker/testdata/...")');
+  for target in $(bazel query 'kind("container_image", "docker/testdata/...")');
   do
     clear_docker
     bazel build $target
@@ -109,7 +109,7 @@ function test_bazel_build_then_run_docker_build_clean() {
 
 function test_bazel_run_docker_build_clean() {
   cd "${ROOT}"
-  for target in $(bazel query 'kind("docker_build", "docker/testdata/...")');
+  for target in $(bazel query 'kind("container_image", "docker/testdata/...")');
   do
     clear_docker
     bazel run $target
@@ -137,7 +137,7 @@ function test_bazel_run_docker_import_clean() {
 function test_bazel_run_docker_build_incremental() {
   cd "${ROOT}"
   clear_docker
-  for target in $(bazel query 'kind("docker_build", "docker/testdata/...")');
+  for target in $(bazel query 'kind("container_image", "docker/testdata/...")');
   do
     bazel run $target
   done