Skip to content

Commit 48ad6d6

Browse files
mostynbuhthomas
authored andcommitted
Switch from cfg = "host" to "exec"
This will be required for bazel 7.0 due to bazelbuild/bazel#17032.
1 parent def5c96 commit 48ad6d6

File tree

20 files changed

+39
-39
lines changed

20 files changed

+39
-39
lines changed

container/flatten.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ container_flatten = rule(
5454
),
5555
"_flattener": attr.label(
5656
default = Label("//container/go/cmd/flattener"),
57-
cfg = "host",
57+
cfg = "exec",
5858
executable = True,
5959
allow_files = True,
6060
),

container/image.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ _attrs = dicts.add(_layer.attrs, {
588588
),
589589
"create_image_config": attr.label(
590590
default = Label("//container/go/cmd/create_image_config:create_image_config"),
591-
cfg = "host",
591+
cfg = "exec",
592592
executable = True,
593593
allow_files = True,
594594
),
@@ -749,7 +749,7 @@ _attrs = dicts.add(_layer.attrs, {
749749
),
750750
"_digester": attr.label(
751751
default = "//container/go/cmd/digester",
752-
cfg = "host",
752+
cfg = "exec",
753753
executable = True,
754754
),
755755
}, _hash_tools, _layer_tools)

container/layer.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ def _impl(
284284
_layer_attrs = dicts.add({
285285
"build_layer": attr.label(
286286
default = Label("//container:build_tar"),
287-
cfg = "host",
287+
cfg = "exec",
288288
executable = True,
289289
allow_files = True,
290290
),

container/layer_tools.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ def incremental_load(
309309
tools = {
310310
"extract_config": attr.label(
311311
default = Label("//container/go/cmd/extract_config:extract_config"),
312-
cfg = "host",
312+
cfg = "exec",
313313
executable = True,
314314
allow_files = True,
315315
),
@@ -319,7 +319,7 @@ tools = {
319319
),
320320
"_join_layers": attr.label(
321321
default = Label("//container/go/cmd/join_layers"),
322-
cfg = "host",
322+
cfg = "exec",
323323
executable = True,
324324
),
325325
}

container/pull.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,25 +91,25 @@ _container_pull_attrs = {
9191
"puller_darwin": attr.label(
9292
executable = True,
9393
default = Label("@go_puller_darwin//file:downloaded"),
94-
cfg = "host",
94+
cfg = "exec",
9595
doc = "Exposed to provide a way to test other pullers on macOS",
9696
),
9797
"puller_linux_amd64": attr.label(
9898
executable = True,
9999
default = Label("@go_puller_linux_amd64//file:downloaded"),
100-
cfg = "host",
100+
cfg = "exec",
101101
doc = "Exposed to provide a way to test other pullers on Linux",
102102
),
103103
"puller_linux_arm64": attr.label(
104104
executable = True,
105105
default = Label("@go_puller_linux_arm64//file:downloaded"),
106-
cfg = "host",
106+
cfg = "exec",
107107
doc = "Exposed to provide a way to test other pullers on Linux",
108108
),
109109
"puller_linux_s390x": attr.label(
110110
executable = True,
111111
default = Label("@go_puller_linux_s390x//file:downloaded"),
112-
cfg = "host",
112+
cfg = "exec",
113113
doc = "Exposed to provide a way to test other pullers on Linux",
114114
),
115115
"registry": attr.string(

container/push.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,12 @@ container_push_ = rule(
200200
),
201201
"_digester": attr.label(
202202
default = "//container/go/cmd/digester",
203-
cfg = "host",
203+
cfg = "exec",
204204
executable = True,
205205
),
206206
"_pusher": attr.label(
207207
default = "//container/go/cmd/pusher",
208-
cfg = "host",
208+
cfg = "exec",
209209
executable = True,
210210
allow_files = True,
211211
),

contrib/automatic_container_release/metadata_merge.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ metadata_merge = rule(
7373
),
7474
"_merger": attr.label(
7575
default = "@io_bazel_rules_docker//contrib/go/cmd/metadata_merge",
76-
cfg = "host",
76+
cfg = "exec",
7777
executable = True,
7878
doc = "The go binary that merges a given list of YAML files to " +
7979
"produce a single output YAML.",

contrib/automatic_container_release/packages_metadata.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ packages_metadata = rule(
4444
),
4545
"_converter": attr.label(
4646
default = "@io_bazel_rules_docker//contrib/go/cmd/packages_metadata",
47-
cfg = "host",
47+
cfg = "exec",
4848
executable = True,
4949
),
5050
},

contrib/compare_ids_test.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ compare_ids_test = rule(
8484
allow_files = True,
8585
default = ":compare_ids_test",
8686
executable = True,
87-
cfg = "host",
87+
cfg = "exec",
8888
),
8989
},
9090
test = True,

contrib/passwd.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ passwd_tar = rule(
138138
attrs = {
139139
"build_tar": attr.label(
140140
default = Label("//container:build_tar"),
141-
cfg = "host",
141+
cfg = "exec",
142142
executable = True,
143143
allow_files = True,
144144
),

0 commit comments

Comments
 (0)