diff --git a/docs/pull.md b/docs/pull.md index 63b08f3e..33676837 100644 --- a/docs/pull.md +++ b/docs/pull.md @@ -94,7 +94,7 @@ See the [examples/credential_helper](/examples/credential_helper/auth.sh) direct
oci_pull(name, image, repository, registry, platforms, digest, tag, reproducible, is_bzlmod, config, - config_path, bazel_tags) + bazel_tags)Repository macro to fetch image manifest data from a remote docker registry. @@ -122,7 +122,6 @@ in rules like `oci_image`. | reproducible | Set to False to silence the warning about reproducibility when using
tag
. | True
|
| is_bzlmod | whether the oci_pull is being called from a module extension | False
|
| config | Label to a .docker/config.json
file. | None
|
-| config_path | Deprecated. use config
attribute or DOCKER_CONFIG environment variable. | None
|
| bazel_tags | Bazel tags to be propagated to generated rules. | []
|
diff --git a/oci/private/pull.bzl b/oci/private/pull.bzl
index 4e95f2fd..d6669319 100644
--- a/oci/private/pull.bzl
+++ b/oci/private/pull.bzl
@@ -28,11 +28,6 @@ _IMAGE_REFERENCE_ATTRS = {
doc = "Label to a .docker/config.json file",
allow_single_file = True,
),
- "config_path": attr.label(
- # TODO(2.0): remove
- doc = "Deprecated. Use DOCKER_CONFIG environment variable or config attribute instead. TODO(2.0): remove",
- allow_single_file = True,
- ),
}
SCHEMA1_ERROR = """\
@@ -72,11 +67,7 @@ _DOWNLOAD_HEADERS = {
def _config_path(rctx):
if rctx.attr.config:
return rctx.path(rctx.attr.config)
- elif rctx.attr.config_path:
- util.warning(rctx, "attribute config_path is deprecated and will be removed in 2.0. use DOCKER_CONFIG environment variable or config attribute instead.")
- return rctx.path(rctx.attr.config_path)
- else:
- return None
+ return None
def _is_tag(str):
return str.find(":") == -1
diff --git a/oci/pull.bzl b/oci/pull.bzl
index 024f9b77..8a1093dc 100644
--- a/oci/pull.bzl
+++ b/oci/pull.bzl
@@ -103,7 +103,7 @@ _PLATFORM_TO_BAZEL_CPU = {
"linux/mips64le": "@platforms//cpu:mips64",
}
-def oci_pull(name, image = None, repository = None, registry = None, platforms = None, digest = None, tag = None, reproducible = True, is_bzlmod = False, config = None, config_path = None, bazel_tags = []):
+def oci_pull(name, image = None, repository = None, registry = None, platforms = None, digest = None, tag = None, reproducible = True, is_bzlmod = False, config = None, bazel_tags = []):
"""Repository macro to fetch image manifest data from a remote docker registry.
To use the resulting image, you can use the `@wkspc` shorthand label, for example
@@ -136,7 +136,6 @@ def oci_pull(name, image = None, repository = None, registry = None, platforms =
Since tags are mutable, this is not reproducible, so a warning is printed.
reproducible: Set to False to silence the warning about reproducibility when using `tag`.
config: Label to a `.docker/config.json` file.
- config_path: Deprecated. use `config` attribute or DOCKER_CONFIG environment variable.
is_bzlmod: whether the oci_pull is being called from a module extension
bazel_tags: Bazel tags to be propagated to generated rules.
"""
@@ -183,8 +182,6 @@ def oci_pull(name, image = None, repository = None, registry = None, platforms =
platform = plat,
target_name = plat_name,
config = config,
- # TODO(2.0): remove
- config_path = config_path,
bazel_tags = bazel_tags,
)
@@ -208,8 +205,6 @@ def oci_pull(name, image = None, repository = None, registry = None, platforms =
identifier = digest or tag,
target_name = single_platform,
config = config,
- # TODO(2.0): remove
- config_path = config_path,
bazel_tags = bazel_tags,
)
@@ -227,6 +222,4 @@ def oci_pull(name, image = None, repository = None, registry = None, platforms =
bzlmod_repository = name if is_bzlmod else None,
reproducible = reproducible,
config = config,
- # TODO(2.0): remove
- config_path = config_path,
)