Remove @bazel_toolchains in load statements in BUILDs. (#200)
This is not necessary and cause builds on GCB to report "ERROR: infinite symlink expansion detected".
In addition, deleted an msan docker autoconfig target under
configs/experimental/BUILD, which are now available under
non-experimental folders, i.e. configs/debian8_clang or
configs/ubuntu16_04_clang.
diff --git a/configs/experimental/BUILD b/configs/experimental/BUILD
index f176103..9c1604a 100644
--- a/configs/experimental/BUILD
+++ b/configs/experimental/BUILD
@@ -15,30 +15,3 @@
licenses(["notice"]) # Apache 2.0
package(default_visibility = ["//visibility:public"])
-
-load("@bazel_toolchains//rules:docker_config.bzl", "docker_toolchain_autoconfig")
-load(
- "@bazel_toolchains//rules:environments.bzl",
- "clang_env",
- "debian8_clang_default_keys",
- "debian8_clang_default_packages",
- "debian8_clang_default_repos",
-)
-
-# Created on 2018.02.13
-# Container: gcr.io/cloud-marketplace/google/clang-debian8@sha256:ac3b1fdc22c0f2b95abe67f2daf33788425fab52d4e6845900bfe1a42443098f
-# This config is still experimental
-# TODO(ngiraldo): remove experimental comment once this has been tested
-docker_toolchain_autoconfig(
- name = "msan-debian8-clang-0.3.0-bazel_0.11.0-autoconfig",
- additional_repos = debian8_clang_default_repos(),
- base = "@debian8-clang//image",
- bazel_version = "0.11.0",
- env = clang_env() + {
- "BAZEL_LINKOPTS": "-lc++:-lc++abi:-lm",
- },
- keys = debian8_clang_default_keys(),
- packages = debian8_clang_default_packages(),
- tags = ["manual"],
- test = True,
-)
diff --git a/container/common/BUILD b/container/common/BUILD
index 343ada9..c19ce8b 100644
--- a/container/common/BUILD
+++ b/container/common/BUILD
@@ -19,11 +19,11 @@
exports_files(glob(["*.yaml"]))
load(
- "@bazel_toolchains//third_party/golang:revision.bzl",
+ "//third_party/golang:revision.bzl",
"GOLANG_REVISION",
)
load(
- "@bazel_toolchains//third_party/openjdk:revision.bzl",
+ "//third_party/openjdk:revision.bzl",
"JDK_VERSION",
"JDK_VERSION_DECODED",
)
diff --git a/container/common/bazel/BUILD b/container/common/bazel/BUILD
index 771d654..caa7089 100644
--- a/container/common/bazel/BUILD
+++ b/container/common/bazel/BUILD
@@ -16,7 +16,7 @@
package(default_visibility = ["//visibility:public"])
-load("@bazel_toolchains//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
+load("//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
exports_files(glob(["**"]))
diff --git a/container/common/clang/BUILD b/container/common/clang/BUILD
index 808a9ae..5fce108 100644
--- a/container/common/clang/BUILD
+++ b/container/common/clang/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//third_party/clang:revision.bzl",
+ "//third_party/clang:revision.bzl",
"CLANG_REVISION",
)
diff --git a/container/debian8/builders/bazel/BUILD b/container/debian8/builders/bazel/BUILD
index 4abb030..28a9531 100644
--- a/container/debian8/builders/bazel/BUILD
+++ b/container/debian8/builders/bazel/BUILD
@@ -17,13 +17,13 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
"toolchain_container",
)
load("@io_bazel_rules_docker//container:container.bzl", "container_image")
load("@io_bazel_rules_docker//contrib:test.bzl", "container_test")
-load("@bazel_toolchains//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
+load("//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
# Tools that are needed in most builds, but not strictly required by bazel.
language_tool_layer(
diff --git a/container/debian8/builders/rbe-debian8/BUILD b/container/debian8/builders/rbe-debian8/BUILD
index 3dab81e..a7c08af 100644
--- a/container/debian8/builders/rbe-debian8/BUILD
+++ b/container/debian8/builders/rbe-debian8/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
"toolchain_container",
)
diff --git a/container/debian8/layers/bazel/BUILD b/container/debian8/layers/bazel/BUILD
index f220958..db0da42 100644
--- a/container/debian8/layers/bazel/BUILD
+++ b/container/debian8/layers/bazel/BUILD
@@ -16,10 +16,10 @@
package(default_visibility = ["//visibility:public"])
-load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "language_tool_layer")
-load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "toolchain_container")
+load("//rules/container:docker_toolchains.bzl", "language_tool_layer")
+load("//rules/container:docker_toolchains.bzl", "toolchain_container")
load("@base_images_docker//util:run.bzl", "container_run_and_extract")
-load("@bazel_toolchains//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
+load("//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
# Tools required by Bazel. Note that we do not add a CC complier here as we
# will include that in the final container.
diff --git a/container/debian8/layers/clang/BUILD b/container/debian8/layers/clang/BUILD
index a3313a7..3e0a248 100644
--- a/container/debian8/layers/clang/BUILD
+++ b/container/debian8/layers/clang/BUILD
@@ -17,10 +17,10 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
)
-load("@bazel_toolchains//container/common/clang:clang.bzl", "clang_env")
+load("//container/common/clang:clang.bzl", "clang_env")
language_tool_layer(
name = "clang-ltl",
diff --git a/container/debian8/layers/go/BUILD b/container/debian8/layers/go/BUILD
index 47755a4..9289e55 100644
--- a/container/debian8/layers/go/BUILD
+++ b/container/debian8/layers/go/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
)
diff --git a/container/debian8/layers/java/BUILD b/container/debian8/layers/java/BUILD
index fc122ac..dd5d98d 100644
--- a/container/debian8/layers/java/BUILD
+++ b/container/debian8/layers/java/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
)
diff --git a/container/debian8/layers/python/BUILD b/container/debian8/layers/python/BUILD
index fbef06a..a17ae5b 100644
--- a/container/debian8/layers/python/BUILD
+++ b/container/debian8/layers/python/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
)
diff --git a/container/experimental/rbe-debian8/BUILD b/container/experimental/rbe-debian8/BUILD
index 6ac6ec6..fae54f3 100644
--- a/container/experimental/rbe-debian8/BUILD
+++ b/container/experimental/rbe-debian8/BUILD
@@ -19,7 +19,7 @@
load("@distroless//cacerts:cacerts.bzl", "cacerts")
load("@jessie_package_bundle//file:packages.bzl", "packages")
load(
- "@bazel_toolchains//skylib:packages.bzl",
+ "//skylib:packages.bzl",
"base_layer_packages",
"clang_layer_packages",
"java_layer_packages",
diff --git a/container/experimental/rbe-debian9/BUILD b/container/experimental/rbe-debian9/BUILD
index 58a0cbf..13f5ccc 100644
--- a/container/experimental/rbe-debian9/BUILD
+++ b/container/experimental/rbe-debian9/BUILD
@@ -17,12 +17,12 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
"toolchain_container",
)
load("@io_bazel_rules_docker//contrib:test.bzl", "container_test")
-load("@bazel_toolchains//container/common/clang:clang.bzl", "clang_env")
+load("//container/common/clang:clang.bzl", "clang_env")
JAVA_CLEANUP_COMMANDS = (
"rm -rf " +
diff --git a/container/ubuntu14_04/builders/bazel/BUILD b/container/ubuntu14_04/builders/bazel/BUILD
index 2f7b838..28698e9 100644
--- a/container/ubuntu14_04/builders/bazel/BUILD
+++ b/container/ubuntu14_04/builders/bazel/BUILD
@@ -17,13 +17,13 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
"toolchain_container",
)
load("@io_bazel_rules_docker//container:container.bzl", "container_image")
load("@io_bazel_rules_docker//contrib:test.bzl", "container_test")
-load("@bazel_toolchains//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
+load("//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
# Tools that are needed in most builds, but not strictly required by bazel.
language_tool_layer(
diff --git a/container/ubuntu14_04/layers/bazel/BUILD b/container/ubuntu14_04/layers/bazel/BUILD
index 8988ba6..e5a6af0 100644
--- a/container/ubuntu14_04/layers/bazel/BUILD
+++ b/container/ubuntu14_04/layers/bazel/BUILD
@@ -16,10 +16,10 @@
package(default_visibility = ["//visibility:public"])
-load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "language_tool_layer")
-load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "toolchain_container")
+load("//rules/container:docker_toolchains.bzl", "language_tool_layer")
+load("//rules/container:docker_toolchains.bzl", "toolchain_container")
load("@base_images_docker//util:run.bzl", "container_run_and_extract")
-load("@bazel_toolchains//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
+load("//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
# Tools required by Bazel. Note that we do not add a CC complier here as we
# will include that in the final container.
diff --git a/container/ubuntu14_04/layers/gcc/BUILD b/container/ubuntu14_04/layers/gcc/BUILD
index a15ca39..642059b 100644
--- a/container/ubuntu14_04/layers/gcc/BUILD
+++ b/container/ubuntu14_04/layers/gcc/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
)
diff --git a/container/ubuntu14_04/layers/java/BUILD b/container/ubuntu14_04/layers/java/BUILD
index 82618cd..5bbda68 100644
--- a/container/ubuntu14_04/layers/java/BUILD
+++ b/container/ubuntu14_04/layers/java/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
)
diff --git a/container/ubuntu14_04/layers/python/BUILD b/container/ubuntu14_04/layers/python/BUILD
index 28ed6b5..50c8d43 100644
--- a/container/ubuntu14_04/layers/python/BUILD
+++ b/container/ubuntu14_04/layers/python/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
)
diff --git a/container/ubuntu16_04/builders/bazel/BUILD b/container/ubuntu16_04/builders/bazel/BUILD
index 28a7cdd..991275d 100644
--- a/container/ubuntu16_04/builders/bazel/BUILD
+++ b/container/ubuntu16_04/builders/bazel/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
"toolchain_container",
)
diff --git a/container/ubuntu16_04/builders/bazel_docker_gcloud/BUILD b/container/ubuntu16_04/builders/bazel_docker_gcloud/BUILD
index 018d6d7..3cb3faa 100644
--- a/container/ubuntu16_04/builders/bazel_docker_gcloud/BUILD
+++ b/container/ubuntu16_04/builders/bazel_docker_gcloud/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
"toolchain_container",
)
diff --git a/container/ubuntu16_04/builders/rbe-ubuntu16_04/BUILD b/container/ubuntu16_04/builders/rbe-ubuntu16_04/BUILD
index 69c4558..876dac0 100644
--- a/container/ubuntu16_04/builders/rbe-ubuntu16_04/BUILD
+++ b/container/ubuntu16_04/builders/rbe-ubuntu16_04/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
"toolchain_container",
)
diff --git a/container/ubuntu16_04/debian_pkgs/BUILD b/container/ubuntu16_04/debian_pkgs/BUILD
index 6eb4bc2..30a6224 100644
--- a/container/ubuntu16_04/debian_pkgs/BUILD
+++ b/container/ubuntu16_04/debian_pkgs/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:debian_pkg_tar.bzl",
+ "//rules/container:debian_pkg_tar.bzl",
"aggregate_debian_pkgs",
)
diff --git a/container/ubuntu16_04/layers/bazel/BUILD b/container/ubuntu16_04/layers/bazel/BUILD
index 0849d68..81bc1f5 100644
--- a/container/ubuntu16_04/layers/bazel/BUILD
+++ b/container/ubuntu16_04/layers/bazel/BUILD
@@ -16,9 +16,9 @@
package(default_visibility = ["//visibility:public"])
-load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "language_tool_layer", "toolchain_container")
+load("//rules/container:docker_toolchains.bzl", "language_tool_layer", "toolchain_container")
load("@base_images_docker//util:run.bzl", "container_run_and_extract")
-load("@bazel_toolchains//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
+load("//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
# Tools required by Bazel. Note that we do not add a CC complier here as we
# will include that in the final container.
diff --git a/container/ubuntu16_04/layers/clang/BUILD b/container/ubuntu16_04/layers/clang/BUILD
index b1a05c6..d8aefa7 100644
--- a/container/ubuntu16_04/layers/clang/BUILD
+++ b/container/ubuntu16_04/layers/clang/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
)
load("//container/common/clang:clang.bzl", "clang_env")
diff --git a/container/ubuntu16_04/layers/docker-17.12.0/BUILD b/container/ubuntu16_04/layers/docker-17.12.0/BUILD
index f1bdd69..2257222 100644
--- a/container/ubuntu16_04/layers/docker-17.12.0/BUILD
+++ b/container/ubuntu16_04/layers/docker-17.12.0/BUILD
@@ -16,7 +16,7 @@
package(default_visibility = ["//visibility:public"])
-load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "language_tool_layer", "toolchain_container")
+load("//rules/container:docker_toolchains.bzl", "language_tool_layer", "toolchain_container")
load("@base_images_docker//package_managers:apt_key.bzl", "add_apt_key")
load("@base_images_docker//package_managers:download_pkgs.bzl", "download_pkgs")
diff --git a/container/ubuntu16_04/layers/gcloud/BUILD b/container/ubuntu16_04/layers/gcloud/BUILD
index 1f7172f..e0e1a2c 100644
--- a/container/ubuntu16_04/layers/gcloud/BUILD
+++ b/container/ubuntu16_04/layers/gcloud/BUILD
@@ -16,9 +16,9 @@
package(default_visibility = ["//visibility:public"])
-load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "language_tool_layer")
+load("//rules/container:docker_toolchains.bzl", "language_tool_layer")
load(
- "@bazel_toolchains//container/ubuntu16_04/layers/gcloud:version.bzl",
+ "//container/ubuntu16_04/layers/gcloud:version.bzl",
"GCLOUD_VERSION",
)
diff --git a/container/ubuntu16_04/layers/go/BUILD b/container/ubuntu16_04/layers/go/BUILD
index 41a5366..8a61de2 100644
--- a/container/ubuntu16_04/layers/go/BUILD
+++ b/container/ubuntu16_04/layers/go/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
)
diff --git a/container/ubuntu16_04/layers/java/BUILD b/container/ubuntu16_04/layers/java/BUILD
index 0ddf0b5..11b1a17 100644
--- a/container/ubuntu16_04/layers/java/BUILD
+++ b/container/ubuntu16_04/layers/java/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
)
diff --git a/container/ubuntu16_04/layers/python/BUILD b/container/ubuntu16_04/layers/python/BUILD
index 0c40086..af926b1 100644
--- a/container/ubuntu16_04/layers/python/BUILD
+++ b/container/ubuntu16_04/layers/python/BUILD
@@ -17,7 +17,7 @@
package(default_visibility = ["//visibility:public"])
load(
- "@bazel_toolchains//rules/container:docker_toolchains.bzl",
+ "//rules/container:docker_toolchains.bzl",
"language_tool_layer",
)
diff --git a/test/configs/BUILD b/test/configs/BUILD
index b5b81da..b5ca4c6 100644
--- a/test/configs/BUILD
+++ b/test/configs/BUILD
@@ -16,10 +16,10 @@
package(default_visibility = ["//visibility:public"])
-load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "toolchain_container")
-load("@bazel_toolchains//rules:docker_config.bzl", "docker_toolchain_autoconfig")
+load("//rules/container:docker_toolchains.bzl", "toolchain_container")
+load("//rules:docker_config.bzl", "docker_toolchain_autoconfig")
load(
- "@bazel_toolchains//rules:environments.bzl",
+ "//rules:environments.bzl",
"clang_env",
"debian8_clang_default_keys",
"debian8_clang_default_packages",
diff --git a/test/container/BUILD b/test/container/BUILD
index cf6b63a..006fbee 100644
--- a/test/container/BUILD
+++ b/test/container/BUILD
@@ -19,7 +19,7 @@
load("@base_images_docker//package_managers:download_pkgs.bzl", "download_pkgs")
load("@base_images_docker//package_managers:install_pkgs.bzl", "install_pkgs")
load("@base_images_docker//package_managers:apt_key.bzl", "add_apt_key")
-load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "toolchain_container")
+load("//rules/container:docker_toolchains.bzl", "toolchain_container")
# This file contains some sample targets that excersise the container rules
# We just keep these as examples that should not break (unless indicated)
