From 8159c6df5303a3033b5601915e8638c5b542a95d Mon Sep 17 00:00:00 2001 From: David Gageot Date: Fri, 5 Jun 2020 16:09:05 +0200 Subject: [PATCH] Update Bazel configuration (#4291) * Update Bazel configuration Signed-off-by: David Gageot * Update bazel Signed-off-by: David Gageot --- deploy/skaffold/Dockerfile | 2 +- deploy/skaffold/Dockerfile.deps | 2 +- examples/bazel/WORKSPACE | 14 +++++++------- integration/examples/bazel/WORKSPACE | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/deploy/skaffold/Dockerfile b/deploy/skaffold/Dockerfile index dd0f271297e..e8a1caca66a 100644 --- a/deploy/skaffold/Dockerfile +++ b/deploy/skaffold/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # This base image has to be updated manually after running `make build_deps` -FROM gcr.io/k8s-skaffold/build_deps:d54e32f303a9bf5ce42978be0b04ae6cba235d37 as builder +FROM gcr.io/k8s-skaffold/build_deps:ba0f614fee736c5863d07ed3c77963a5fb41811e as builder WORKDIR /skaffold COPY . . diff --git a/deploy/skaffold/Dockerfile.deps b/deploy/skaffold/Dockerfile.deps index f2233ffe799..497cf12dba8 100644 --- a/deploy/skaffold/Dockerfile.deps +++ b/deploy/skaffold/Dockerfile.deps @@ -63,7 +63,7 @@ RUN tar -zxf gcloud.tar.gz # Download bazel FROM alpine:3.10 as download-bazel -ENV BAZEL_VERSION 2.0.0 +ENV BAZEL_VERSION 3.2.0 ENV BAZEL_URL https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-linux-x86_64 RUN wget -O bazel "${BAZEL_URL}" RUN chmod +x bazel diff --git a/examples/bazel/WORKSPACE b/examples/bazel/WORKSPACE index 095a2e3f96b..1c1f8a3ea15 100644 --- a/examples/bazel/WORKSPACE +++ b/examples/bazel/WORKSPACE @@ -4,25 +4,25 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "io_bazel_rules_docker", - sha256 = "df13123c44b4a4ff2c2f337b906763879d94871d16411bf82dcfeba892b58607", - strip_prefix = "rules_docker-0.13.0", - urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.13.0/rules_docker-v0.13.0.tar.gz"], + sha256 = "3efbd23e195727a67f87b2a04fb4388cc7a11a0c0c2cf33eec225fb8ffbb27ea", + strip_prefix = "rules_docker-0.14.2", + urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.14.2/rules_docker-v0.14.2.tar.gz"], ) http_archive( name = "io_bazel_rules_go", + sha256 = "a8d6b1b354d371a646d2f7927319974e0f9e52f73a2452d2b3877118169eb6bb", urls = [ - "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/v0.20.3/rules_go-v0.20.3.tar.gz", - "https://github.com/bazelbuild/rules_go/releases/download/v0.20.3/rules_go-v0.20.3.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.23.3/rules_go-v0.23.3.tar.gz", + "https://github.com/bazelbuild/rules_go/releases/download/v0.23.3/rules_go-v0.23.3.tar.gz", ], - sha256 = "e88471aea3a3a4f19ec1310a55ba94772d087e9ce46e41ae38ecebe17935de7b", ) load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains") go_rules_dependencies() go_register_toolchains( - go_version = "1.13.5", + go_version = "1.14.4", ) load( diff --git a/integration/examples/bazel/WORKSPACE b/integration/examples/bazel/WORKSPACE index 095a2e3f96b..1c1f8a3ea15 100644 --- a/integration/examples/bazel/WORKSPACE +++ b/integration/examples/bazel/WORKSPACE @@ -4,25 +4,25 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "io_bazel_rules_docker", - sha256 = "df13123c44b4a4ff2c2f337b906763879d94871d16411bf82dcfeba892b58607", - strip_prefix = "rules_docker-0.13.0", - urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.13.0/rules_docker-v0.13.0.tar.gz"], + sha256 = "3efbd23e195727a67f87b2a04fb4388cc7a11a0c0c2cf33eec225fb8ffbb27ea", + strip_prefix = "rules_docker-0.14.2", + urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.14.2/rules_docker-v0.14.2.tar.gz"], ) http_archive( name = "io_bazel_rules_go", + sha256 = "a8d6b1b354d371a646d2f7927319974e0f9e52f73a2452d2b3877118169eb6bb", urls = [ - "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/v0.20.3/rules_go-v0.20.3.tar.gz", - "https://github.com/bazelbuild/rules_go/releases/download/v0.20.3/rules_go-v0.20.3.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.23.3/rules_go-v0.23.3.tar.gz", + "https://github.com/bazelbuild/rules_go/releases/download/v0.23.3/rules_go-v0.23.3.tar.gz", ], - sha256 = "e88471aea3a3a4f19ec1310a55ba94772d087e9ce46e41ae38ecebe17935de7b", ) load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains") go_rules_dependencies() go_register_toolchains( - go_version = "1.13.5", + go_version = "1.14.4", ) load(