Skip to content

Commit 66285e1

Browse files
erock2112SkCQ
authored andcommitted
Revert "[bazel 7] Fix docker builds"
This reverts commit 84bcb1f. Reason for revert: Louhi failing Original change's description: > [bazel 7] Fix docker builds > > io_bazel_rules_docker has some compatibility issues with Bazel 7+. We > can work around them by updating and setting some build flags, per > buildfarm/buildfarm#1446. > > We will have to migrate off of io_bazel_rules_docker soon, since it's > unmaintained. > > Bug: b/458681039 > Change-Id: I474a833f4664b895bb9d17c8016cda9695e3c9f6 > Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/1099516 > Commit-Queue: Kaylee Lubick <[email protected]> > Auto-Submit: Eric Boren <[email protected]> > Reviewed-by: Kaylee Lubick <[email protected]> Bug: b/458681039 No-Presubmit: true No-Tree-Checks: true No-Try: true Change-Id: I968ec633d5189bff7e0d231da1755dff12a6a169 Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/1099556 Auto-Submit: Eric Boren <[email protected]> Commit-Queue: Rubber Stamper <[email protected]> Bot-Commit: Rubber Stamper <[email protected]>
1 parent 683c384 commit 66285e1

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

.bazelrc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,3 @@ try-import %workspace%/bazel/user/bazelrc
188188
#
189189
# Bazel complains if --config=mayberemote is undefined, so a default "no-op" definition is needed.
190190
build:mayberemote --color=auto # Does nothing: --color is "auto" by default.
191-
192-
# See https://github.com/buildfarm/buildfarm/issues/1446
193-
build --@io_bazel_rules_docker//transitions:enable=false
194-
query --@io_bazel_rules_docker//transitions:enable=false
195-
fetch --@io_bazel_rules_docker//transitions:enable=false

WORKSPACE

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,11 @@ rules_pkg_dependencies()
257257

258258
http_archive(
259259
name = "io_bazel_rules_docker",
260-
sha256 = "b1e80761a8a8243d03ebca8845e9cc1ba6c82ce7c5179ce2b295cd36f7e394bf",
260+
sha256 = "27d53c1d646fc9537a70427ad7b034734d08a9c38924cc6357cc973fed300820",
261+
strip_prefix = "rules_docker-0.24.0",
261262
urls = gcs_mirror_url(
262-
sha256 = "b1e80761a8a8243d03ebca8845e9cc1ba6c82ce7c5179ce2b295cd36f7e394bf",
263-
url = "https://github.com/bazelbuild/rules_docker/releases/download/v0.25.0/rules_docker-v0.25.0.tar.gz",
263+
sha256 = "27d53c1d646fc9537a70427ad7b034734d08a9c38924cc6357cc973fed300820",
264+
url = "https://github.com/bazelbuild/rules_docker/releases/download/v0.24.0/rules_docker-v0.24.0.tar.gz",
264265
),
265266
)
266267

0 commit comments

Comments
 (0)