Skip to content

Commit

Permalink
Switch to debian9 for nodejs base.
Browse files Browse the repository at this point in the history
  • Loading branch information
mattmoor committed Dec 9, 2017
1 parent 541834b commit 8f6f1c8
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ instead of `py_image`. The other semantics are identical.
**It is notable that unlike the other image rules, `nodejs_image` is not
currently using the `gcr.io/distroless/nodejs` image for a handful of reasons.**
This is a switch we plan to make, when we can manage it. We are currently
utilizing the `gcr.io/google-appengine/base` image as our base.
utilizing the `gcr.io/google-appengine/debian9` image as our base.

To use `nodejs_image`, add the following to `WORKSPACE`:

Expand Down
4 changes: 2 additions & 2 deletions cc/cc.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
# git repository.

DIGESTS = {
# "gcr.io/distroless/cc:debug" circa 2017-12-09 23:05 +0000
# "gcr.io/distroless/cc:debug" circa 2017-12-09 23:07 +0000
"debug": "sha256:d3fe07be221200e6a7c9981545da4394cd6177ab80012da65a858069bd374bb9",
# "gcr.io/distroless/cc:latest" circa 2017-12-09 23:05 +0000
# "gcr.io/distroless/cc:latest" circa 2017-12-09 23:07 +0000
"latest": "sha256:7a52af4e4f09c905f2264c99ec75f65481fd132454f3ff4dd06962c99c7dab6e",
}
4 changes: 2 additions & 2 deletions go/go.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
# git repository.

DIGESTS = {
# "gcr.io/distroless/base:debug" circa 2017-12-09 23:05 +0000
# "gcr.io/distroless/base:debug" circa 2017-12-09 23:07 +0000
"debug": "sha256:2a4edff9a50ea5c0aa40cf3c99206b9e8efe6ca131f774f2c279e22762e90792",
# "gcr.io/distroless/base:latest" circa 2017-12-09 23:05 +0000
# "gcr.io/distroless/base:latest" circa 2017-12-09 23:07 +0000
"latest": "sha256:bef8d030c7f36dfb73a8c76137616faeea73ac5a8495d535f27c911d0db77af3",
}
4 changes: 2 additions & 2 deletions java/java.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
# git repository.

DIGESTS = {
# "gcr.io/distroless/java:debug" circa 2017-12-09 23:05 +0000
# "gcr.io/distroless/java:debug" circa 2017-12-09 23:07 +0000
"debug": "sha256:61dc3d88cac3362e29130a630bdf21be1b663ae54fa671e46b6d73054e87646a",
# "gcr.io/distroless/java:latest" circa 2017-12-09 23:05 +0000
# "gcr.io/distroless/java:latest" circa 2017-12-09 23:07 +0000
"latest": "sha256:7bde7029b0ca01fbf7dfcf4bbce879705711112ed66f9f981209d7d1422cbea2",
}
4 changes: 2 additions & 2 deletions java/jetty.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
# git repository.

DIGESTS = {
# "gcr.io/distroless/java/jetty:debug" circa 2017-12-09 23:05 +0000
# "gcr.io/distroless/java/jetty:debug" circa 2017-12-09 23:07 +0000
"debug": "sha256:514da00aeeefccdd3f514b77505366c92fffac2791467164ed52b2db92228484",
# "gcr.io/distroless/java/jetty:latest" circa 2017-12-09 23:05 +0000
# "gcr.io/distroless/java/jetty:latest" circa 2017-12-09 23:07 +0000
"latest": "sha256:f623f87da1e3e1e9802b20f8f7e84af4791493b5d051d0c62014683054add6d7",
}
4 changes: 2 additions & 2 deletions nodejs/image.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ def repositories():
container_pull(
name = "nodejs_image_base",
registry = "gcr.io",
repository = "google-appengine/base",
repository = "google-appengine/debian9",
digest = DIGESTS["latest"],
)
if "nodejs_debug_image_base" not in excludes:
container_pull(
name = "nodejs_debug_image_base",
registry = "gcr.io",
repository = "google-appengine/base",
repository = "google-appengine/debian9",
digest = DIGESTS["debug"],
)

Expand Down
8 changes: 4 additions & 4 deletions nodejs/nodejs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
# git repository.

DIGESTS = {
# "gcr.io/google-appengine/base:debug" circa 2017-12-09 23:05 +0000
"debug": "sha256:c2e1aa7b3713c5bc8f4032cc26ff9f616542d105b4d0bcaceeadc8083c9c109e",
# "gcr.io/google-appengine/base:latest" circa 2017-12-09 23:05 +0000
"latest": "sha256:c2e1aa7b3713c5bc8f4032cc26ff9f616542d105b4d0bcaceeadc8083c9c109e",
# "gcr.io/google-appengine/debian9:debug" circa 2017-12-09 23:07 +0000
"debug": "sha256:6c76ed9ff726a1433243c3c2e8806e4f2ef2cbacddaca7c9e15f7d4312b1bb9f",
# "gcr.io/google-appengine/debian9:latest" circa 2017-12-09 23:07 +0000
"latest": "sha256:6c76ed9ff726a1433243c3c2e8806e4f2ef2cbacddaca7c9e15f7d4312b1bb9f",
}
4 changes: 2 additions & 2 deletions python/python.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
# git repository.

DIGESTS = {
# "gcr.io/distroless/python2.7:debug" circa 2017-12-09 23:05 +0000
# "gcr.io/distroless/python2.7:debug" circa 2017-12-09 23:07 +0000
"debug": "sha256:bcc4820cd633a461b6570b81cce3e73d6b169bb847d1f68112289a73da5abf02",
# "gcr.io/distroless/python2.7:latest" circa 2017-12-09 23:05 +0000
# "gcr.io/distroless/python2.7:latest" circa 2017-12-09 23:07 +0000
"latest": "sha256:32904fecb9aa09d347dc8b76d2ffc4cc4fc183a9e026b0dbdd01254b4dfd2d86",
}
4 changes: 2 additions & 2 deletions python3/python3.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
# git repository.

DIGESTS = {
# "gcr.io/distroless/python3:debug" circa 2017-12-09 23:05 +0000
# "gcr.io/distroless/python3:debug" circa 2017-12-09 23:07 +0000
"debug": "sha256:b85549147ef95174e03da6f54693fe96c533d3ae1a505db7cdd428bdac8ccffd",
# "gcr.io/distroless/python3:latest" circa 2017-12-09 23:05 +0000
# "gcr.io/distroless/python3:latest" circa 2017-12-09 23:07 +0000
"latest": "sha256:db2582d604778faf02fefb7089b8ce9f1e6fa62dda04eb3a4c510c31cc1d2799",
}
2 changes: 1 addition & 1 deletion update_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ bazel run tools:update_deps -- --repository=gcr.io/distroless/python2.7 --output
bazel run tools:update_deps -- --repository=gcr.io/distroless/python3 --output=$PWD/python3/python3.bzl
bazel run tools:update_deps -- --repository=gcr.io/distroless/java --output=$PWD/java/java.bzl
bazel run tools:update_deps -- --repository=gcr.io/distroless/java/jetty --output=$PWD/java/jetty.bzl
bazel run tools:update_deps -- --repository=gcr.io/google-appengine/base --output=$PWD/nodejs/nodejs.bzl
bazel run tools:update_deps -- --repository=gcr.io/google-appengine/debian9 --output=$PWD/nodejs/nodejs.bzl

0 comments on commit 8f6f1c8

Please sign in to comment.