From e4733953d36e4659989356e64a8b9bae6f6258ea Mon Sep 17 00:00:00 2001 From: jianglai Date: Tue, 4 Dec 2018 07:42:56 -0800 Subject: [PATCH] Update bazel version to 0.20.0 Also updated distroless base image to include the latest vulnerability fixes. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=223975505 --- WORKSPACE | 14 ++++++++++---- docs/install.md | 6 +++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index c5ab5f178..8109bbdd6 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,5 +1,7 @@ workspace(name = "domain_registry") +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + # https://github.com/bazelbuild/rules_closure/releases/tag/0.8.0 http_archive( name = "io_bazel_rules_closure", @@ -26,10 +28,11 @@ load("//java/google/registry:repositories.bzl", "domain_registry_repositories") domain_registry_repositories() # Setup docker bazel rules -git_repository( +http_archive( name = "io_bazel_rules_docker", - remote = "https://github.com/bazelbuild/rules_docker.git", - tag = "v0.4.0", + sha256 = "29d109605e0d6f9c892584f07275b8c9260803bf0c6fcb7de2623b2bedc910bd", + strip_prefix = "rules_docker-0.5.1", + urls = ["https://github.com/bazelbuild/rules_docker/archive/v0.5.1.tar.gz"], ) load( @@ -38,11 +41,14 @@ load( container_repositories = "repositories", ) +# This is NOT needed when going through the language lang_image +# "repositories" function(s). container_repositories() container_pull( name = "java_base", registry = "gcr.io", repository = "distroless/java", - digest = "sha256:780ee786a774a25a4485f491b3e0a21f7faed01864640af7cebec63c46a0845a", + # 'tag' is also supported, but digest is encouraged for reproducibility. + digest = "sha256:8c1769cb253bdecc257470f7fba05446a55b70805fa686f227a11655a90dfe9e", ) diff --git a/docs/install.md b/docs/install.md index 0866d52f8..6f6aaec0f 100644 --- a/docs/install.md +++ b/docs/install.md @@ -7,8 +7,8 @@ This document covers the steps necessary to download, build, and deploy Nomulus. You will need the following programs installed on your local machine: * A recent version of the [Java 8 JDK][java-jdk8]. -* [Bazel build system](http://bazel.io/) (version [0.19.2][bazel-version] - works as of 2018-11-19). +* [Bazel build system](http://bazel.io/) (version [0.20.0][bazel-version] + works as of 2018-12-03). * [Google App Engine SDK for Java][app-engine-sdk], and configure aliases to to the `gcloud` and `appcfg.sh` utilities (you'll use them a lot). * [Git](https://git-scm.com/) version control system. @@ -181,4 +181,4 @@ See the [first steps tutorial](./first-steps-tutorial.md) for more information. [app-engine-sdk]: https://cloud.google.com/appengine/docs/java/download [java-jdk8]: http://www.oracle.com/technetwork/java/javase/downloads -[bazel-version]: https://github.com/bazelbuild/bazel/releases/download/0.19.2/bazel-0.19.2-installer-linux-x86_64.sh +[bazel-version]: https://github.com/bazelbuild/bazel/releases/download/0.20.0/bazel-0.20.0-installer-linux-x86_64.sh