Skip to content

Commit 2ece6df

Browse files
authored
Fixed some missing digests and addressed other warnings (#1819)
1 parent afd5520 commit 2ece6df

2 files changed

Lines changed: 41 additions & 30 deletions

File tree

WORKSPACE

Lines changed: 40 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ container_pull(
6262
name = "alpine_linux_armv6_tar",
6363
architecture = "arm",
6464
cpu_variant = "v6",
65+
digest = "sha256:dabea2944dcc2b86482b4f0b0fb62da80e0673e900c46c0e03b45919881a5d84",
6566
os = "linux",
6667
registry = "index.docker.io",
6768
repository = "library/alpine",
@@ -77,6 +78,7 @@ container_pull(
7778

7879
container_pull(
7980
name = "alpine_linux_amd64_tar",
81+
digest = "sha256:954b378c375d852eb3c63ab88978f640b4348b01c1b3456a024a81536dafbbf4",
8082
registry = "index.docker.io",
8183
repository = "library/alpine",
8284
tag = "3.8",
@@ -85,19 +87,22 @@ container_pull(
8587
container_pull(
8688
name = "alpine_linux_ppc64le_tar",
8789
architecture = "ppc64le",
90+
digest = "sha256:402d21757a03a114d273bbe372fa4b9eca567e8b6c332fa7ebf982b902207242",
8891
registry = "index.docker.io",
8992
repository = "library/alpine",
9093
tag = "3.8",
9194
)
9295

9396
container_pull(
9497
name = "distroless_base",
98+
digest = "sha256:75f63d4edd703030d4312dc7528a349ca34d48bec7bd754652b2d47e5a0b7873",
9599
registry = "gcr.io",
96100
repository = "distroless/base",
97101
)
98102

99103
container_pull(
100104
name = "distroless_cc",
105+
digest = "sha256:c33fbcd3f924892f2177792bebc11f7a7e88ccbc247f0d0a01a812692259503a",
101106
registry = "gcr.io",
102107
repository = "distroless/cc",
103108
)
@@ -123,6 +128,7 @@ container_load(
123128

124129
container_pull(
125130
name = "alpine_linux_amd64",
131+
digest = "sha256:954b378c375d852eb3c63ab88978f640b4348b01c1b3456a024a81536dafbbf4",
126132
registry = "index.docker.io",
127133
repository = "library/alpine",
128134
tag = "3.8",
@@ -132,6 +138,7 @@ container_pull(
132138
name = "alpine_linux_armv6",
133139
architecture = "arm",
134140
cpu_variant = "v6",
141+
digest = "sha256:dabea2944dcc2b86482b4f0b0fb62da80e0673e900c46c0e03b45919881a5d84",
135142
os = "linux",
136143
registry = "index.docker.io",
137144
repository = "library/alpine",
@@ -141,6 +148,7 @@ container_pull(
141148
container_pull(
142149
name = "alpine_linux_ppc64le",
143150
architecture = "ppc64le",
151+
digest = "sha256:402d21757a03a114d273bbe372fa4b9eca567e8b6c332fa7ebf982b902207242",
144152
registry = "index.docker.io",
145153
repository = "library/alpine",
146154
tag = "3.8",
@@ -149,13 +157,15 @@ container_pull(
149157
container_pull(
150158
name = "k8s_pause_arm64",
151159
architecture = "arm64",
160+
digest = "sha256:f365626a556e58189fc21d099fc64603db0f440bff07f77c740989515c544a39",
152161
registry = "k8s.gcr.io",
153162
repository = "pause",
154163
tag = "3.1",
155164
)
156165

157166
container_pull(
158167
name = "official_xenial",
168+
digest = "sha256:89fd38d069a9a369525ade2bfb6922e62422db58813fccac0ecc1e59dfab0a59",
159169
registry = "index.docker.io",
160170
repository = "library/ubuntu",
161171
tag = "16.04",
@@ -225,12 +235,14 @@ http_archive(
225235

226236
http_archive(
227237
name = "ubuntu1604",
238+
sha256 = "eb50020790e22538676e17c0242b9272bdb5c81f7bc6b128a4abfa7ad31faf5b",
228239
strip_prefix = "base-images-docker-36456edd3cc5a4d17852439cdcb038022cd912e5/ubuntu1604",
229240
urls = ["https://github.com/GoogleContainerTools/base-images-docker/archive/36456edd3cc5a4d17852439cdcb038022cd912e5.tar.gz"],
230241
)
231242

232243
http_archive(
233244
name = "debian9",
245+
sha256 = "eb50020790e22538676e17c0242b9272bdb5c81f7bc6b128a4abfa7ad31faf5b",
234246
strip_prefix = "base-images-docker-36456edd3cc5a4d17852439cdcb038022cd912e5/debian9",
235247
urls = ["https://github.com/GoogleContainerTools/base-images-docker/archive/36456edd3cc5a4d17852439cdcb038022cd912e5.tar.gz"],
236248
)
@@ -355,10 +367,6 @@ yarn_install(
355367
yarn_lock = "//testdata:yarn.lock",
356368
)
357369

358-
load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
359-
360-
install_bazel_dependencies()
361-
362370
load(
363371
"//nodejs:image.bzl",
364372
_nodejs_image_repos = "repositories",
@@ -398,11 +406,10 @@ register_execution_platforms(
398406

399407
http_archive(
400408
name = "bazel_toolchains",
401-
sha256 = "89a053218639b1c5e3589a859bb310e0a402dedbe4ee369560e66026ae5ef1f2",
402-
strip_prefix = "bazel-toolchains-3.5.0",
409+
sha256 = "1adf7a8e9901287c644dcf9ca08dd8d67a69df94bedbd57a841490a84dc1e9ed",
410+
strip_prefix = "bazel-toolchains-5.0.0",
403411
urls = [
404-
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.5.0/bazel-toolchains-3.5.0.tar.gz",
405-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/3.5.0.tar.gz",
412+
"https://github.com/bazelbuild/bazel-toolchains/archive/v5.0.0.tar.gz",
406413
],
407414
)
408415

@@ -437,11 +444,12 @@ http_archive(
437444
name = "httplib2",
438445
build_file_content = """
439446
py_library(
440-
name = "httplib2",
441-
srcs = glob(["**/*.py"]),
442-
data = ["cacerts.txt"],
443-
visibility = ["//visibility:public"]
444-
)""",
447+
name = "httplib2",
448+
srcs = glob(["**/*.py"]),
449+
data = ["cacerts.txt"],
450+
visibility = ["//visibility:public"],
451+
)
452+
""",
445453
sha256 = "f2f35e29e99e8d9bb5921c17ede6ee10bd5bd971f2cd0b3aaaa20088754f89ba",
446454
strip_prefix = "httplib2-0.18.1/python3/httplib2/",
447455
type = "tar.gz",
@@ -455,16 +463,18 @@ http_archive(
455463
build_file_content = """
456464
# Rename six.py to __init__.py
457465
genrule(
458-
name = "rename",
459-
srcs = ["six.py"],
460-
outs = ["__init__.py"],
461-
cmd = "cat $< >$@",
466+
name = "rename",
467+
srcs = ["six.py"],
468+
outs = ["__init__.py"],
469+
cmd = "cat $< >$@",
462470
)
471+
463472
py_library(
464-
name = "six",
465-
srcs = [":__init__.py"],
466-
visibility = ["//visibility:public"],
467-
)""",
473+
name = "six",
474+
srcs = [":__init__.py"],
475+
visibility = ["//visibility:public"],
476+
)
477+
""",
468478
sha256 = "e24052411fc4fbd1f672635537c3fc2330d9481b18c0317695b46259512c91d5",
469479
strip_prefix = "six-1.9.0/",
470480
type = "tar.gz",
@@ -477,14 +487,15 @@ http_archive(
477487
name = "oauth2client",
478488
build_file_content = """
479489
py_library(
480-
name = "oauth2client",
481-
srcs = glob(["**/*.py"]),
482-
visibility = ["//visibility:public"],
483-
deps = [
484-
"@httplib2//:httplib2",
485-
"@six//:six",
486-
]
487-
)""",
490+
name = "oauth2client",
491+
srcs = glob(["**/*.py"]),
492+
visibility = ["//visibility:public"],
493+
deps = [
494+
"@httplib2//:httplib2",
495+
"@six//:six",
496+
],
497+
)
498+
""",
488499
sha256 = "7230f52f7f1d4566a3f9c3aeb5ffe2ed80302843ce5605853bee1f08098ede46",
489500
strip_prefix = "oauth2client-4.0.0/oauth2client/",
490501
type = "tar.gz",

tests/docker/toolchain_container/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ container_test(
103103
# toolchain_container with language_tool_layer with tars
104104
pkg_tar(
105105
name = "test_tar",
106-
files = [
106+
srcs = [
107107
"//tests/docker:launchpad_openjdk_gpg",
108108
],
109109
)

0 commit comments

Comments
 (0)