Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add s390x support to load puller and loader binary #1661

Merged
merged 1 commit into from
Nov 4, 2020
Merged

Add s390x support to load puller and loader binary #1661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions container/load.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,13 @@ container_import(
layers = glob(["*.tar.gz"]),
)""")

loader = repository_ctx.attr._loader_linux
loader = repository_ctx.attr._loader_linux_amd64
if repository_ctx.os.name.lower().startswith("mac os"):
loader = repository_ctx.attr._loader_darwin
elif repository_ctx.os.name.lower().startswith("linux"):
arch = repository_ctx.execute(["uname", "-m"]).stdout.strip()
if arch == "s390x":
loader = repository_ctx.attr._loader_linux_s390x

result = repository_ctx.execute([
repository_ctx.path(loader),
Expand All @@ -59,9 +63,14 @@ container_load = repository_rule(
default = Label("@loader_darwin//file:downloaded"),
cfg = "host",
),
"_loader_linux": attr.label(
"_loader_linux_amd64": attr.label(
executable = True,
default = Label("@loader_linux//file:downloaded"),
default = Label("@loader_linux_amd64//file:downloaded"),
cfg = "host",
),
"_loader_linux_s390x": attr.label(
executable = True,
default = Label("@loader_linux_s390x//file:downloaded"),
cfg = "host",
),
},
Expand Down
16 changes: 13 additions & 3 deletions container/pull.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,15 @@ _container_pull_attrs = {
cfg = "host",
doc = "(optional) Exposed to provide a way to test other pullers on macOS",
),
"puller_linux": attr.label(
"puller_linux_amd64": attr.label(
executable = True,
default = Label("@go_puller_linux//file:downloaded"),
default = Label("@go_puller_linux_amd64//file:downloaded"),
cfg = "host",
doc = "(optional) Exposed to provide a way to test other pullers on Linux",
),
"puller_linux_s390x": attr.label(
executable = True,
default = Label("@go_puller_linux_s390x//file:downloaded"),
cfg = "host",
doc = "(optional) Exposed to provide a way to test other pullers on Linux",
),
Expand Down Expand Up @@ -97,9 +103,13 @@ def _impl(repository_ctx):

import_rule_tags = "[\"{}\"]".format("\", \"".join(repository_ctx.attr.import_tags))

puller = repository_ctx.attr.puller_linux
puller = repository_ctx.attr.puller_linux_amd64
if repository_ctx.os.name.lower().startswith("mac os"):
puller = repository_ctx.attr.puller_darwin
elif repository_ctx.os.name.lower().startswith("linux"):
arch = repository_ctx.execute(["uname", "-m"]).stdout.strip()
if arch == "s390x":
puller = repository_ctx.attr.puller_linux_s390x

args = [
repository_ctx.path(puller),
Expand Down
34 changes: 25 additions & 9 deletions repositories/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,42 +25,58 @@ load(

# The release of the github.com/google/containerregistry to consume.
CONTAINERREGISTRY_RELEASE = "v0.0.38"
RULES_DOCKER_GO_BINARY_RELEASE = "fdebd6e0b6c9185a115379166c1c067f88d53630"
RULES_DOCKER_GO_BINARY_RELEASE = "aad94363e63d31d574cf701df484b3e8b868a96a"

def repositories():
"""Download dependencies of container rules."""
excludes = native.existing_rules().keys()

# Go binaries.
if "go_puller_linux" not in excludes:
if "go_puller_linux_amd64" not in excludes:
http_file(
name = "go_puller_linux",
name = "go_puller_linux_amd64",
executable = True,
sha256 = "1bcbbf86972cde8448dfab770a686801c46a1739f68f1d7a5373a4f0c3954846",
sha256 = "08b8963cce9234f57055bafc7cadd1624cdce3c5990048cea1df453d7d288bc6",
urls = [("https://storage.googleapis.com/rules_docker/" + RULES_DOCKER_GO_BINARY_RELEASE + "/puller-linux-amd64")],
)

if "go_puller_linux_s390x" not in excludes:
http_file(
name = "go_puller_linux_s390x",
executable = True,
sha256 = "a5527b7b3b4a266e4680a4ad8939429665d4173f26b35d5d317385134369e438",
urls = [("https://storage.googleapis.com/rules_docker/" + RULES_DOCKER_GO_BINARY_RELEASE + "/puller-linux-s390x")],
)

if "go_puller_darwin" not in excludes:
http_file(
name = "go_puller_darwin",
executable = True,
sha256 = "62b405511624528ba5b2716b1b93b5591c41edeca57195efc62da14001441c44",
sha256 = "4855c4f5927f8fb0f885510ab3e2a166d5fa7cde765fbe9aec97dc6b2761bb22",
urls = [("https://storage.googleapis.com/rules_docker/" + RULES_DOCKER_GO_BINARY_RELEASE + "/puller-darwin-amd64")],
)

if "loader_linux" not in excludes:
if "loader_linux_amd64" not in excludes:
http_file(
name = "loader_linux",
name = "loader_linux_amd64",
executable = True,
sha256 = "06b6baaddbb42854a2d854f014d3af7cd67ff40741b49ba66efd35991752efc4",
sha256 = "5e5ada66beff07f9188bdc1f99c3fa37c407fc0048cd78b9c2047e9c5516f20b",
urls = [("https://storage.googleapis.com/rules_docker/" + RULES_DOCKER_GO_BINARY_RELEASE + "/loader-linux-amd64")],
)

if "loader_linux_s390x" not in excludes:
http_file(
name = "loader_linux_s390x",
executable = True,
sha256 = "0c0ebc3e0a502542547a38b51f4686a049897eeb4cbc0e2f07fc25276c57866f",
urls = [("https://storage.googleapis.com/rules_docker/" + RULES_DOCKER_GO_BINARY_RELEASE + "/loader-linux-s390x")],
)

if "loader_darwin" not in excludes:
http_file(
name = "loader_darwin",
executable = True,
sha256 = "8572f547b87143e344bcab3155b18ff438351a256b4c90dfab72beb02b46b178",
sha256 = "8c9986b2b506febbff737090d9ec485cec1376c52789747573521a85194341c1",
urls = [("https://storage.googleapis.com/rules_docker/" + RULES_DOCKER_GO_BINARY_RELEASE + "/loader-darwin-amd64")],
)

Expand Down