From 6454778f5ad7da1c124fa8123840bea6c8ba3748 Mon Sep 17 00:00:00 2001 From: Cory Cross Date: Thu, 17 Aug 2023 10:37:02 -0700 Subject: [PATCH 1/2] Correct docs for container_layer's mode attribute --- container/layer.bzl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/container/layer.bzl b/container/layer.bzl index d7c1732dd..927e1f01a 100644 --- a/container/layer.bzl +++ b/container/layer.bzl @@ -344,8 +344,12 @@ _layer_attrs = dicts.add({ A list of files that should be included in the Docker image.""", ), "mode": attr.string( - default = "0o555", # 0o555 == a+rx - doc = "Set the mode of files added by the `files` attribute.", + default = "0o555", + doc = """Set the mode of files and directories added. + + "0o555" == a+rx + + Applies to `files`, `empty_files`, and `empty_dirs` attributes.""", ), "mtime": attr.int(default = _DEFAULT_MTIME), "operating_system": attr.string( From 417105b9fc3f15ab2da8b0ee9b541988677278d8 Mon Sep 17 00:00:00 2001 From: Cory Cross Date: Thu, 17 Aug 2023 10:44:26 -0700 Subject: [PATCH 2/2] Also applies to empty_root_dirs --- container/layer.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/layer.bzl b/container/layer.bzl index 927e1f01a..24c491ec1 100644 --- a/container/layer.bzl +++ b/container/layer.bzl @@ -349,7 +349,7 @@ _layer_attrs = dicts.add({ "0o555" == a+rx - Applies to `files`, `empty_files`, and `empty_dirs` attributes.""", + Applies to `files`, `empty_files`, `empty_dirs`, and `empty_root_dirs` attributes.""", ), "mtime": attr.int(default = _DEFAULT_MTIME), "operating_system": attr.string(