diff --git a/WORKSPACE b/WORKSPACE index 0b78e910d..7f906be4e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -76,9 +76,9 @@ http_archive( http_archive( name = "io_bazel_rules_docker", - sha256 = "59d5b42ac315e7eadffa944e86e90c2990110a1c8075f1cd145f487e999d22b3", - strip_prefix = "rules_docker-0.17.0", - urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.17.0/rules_docker-v0.17.0.tar.gz"], + sha256 = "1f4e59843b61981a96835dc4ac377ad4da9f8c334ebe5e0bb3f58f80c09735f4", + strip_prefix = "rules_docker-0.19.0", + urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.19.0/rules_docker-v0.19.0.tar.gz"], ) http_archive( @@ -139,6 +139,34 @@ load( "container_pull", ) +container_pull( + name = "cc_image_base", + digest = "sha256:2c4bb6b7236db0a55ec54ba8845e4031f5db2be957ac61867872bf42e56c4deb", + registry = "gcr.io", + repository = "distroless/cc", +) + +container_pull( + name = "cc_debug_image_base", + digest = "sha256:3680c61e81f68fc00bfb5e1ec65e8e678aaafa7c5f056bc2681c29527ebbb30c", + registry = "gcr.io", + repository = "distroless/cc", +) + +container_pull( + name = "go_image_base", + digest = "sha256:ba7a315f86771332e76fa9c3d423ecfdbb8265879c6f1c264d6fff7d4fa460a4", + registry = "gcr.io", + repository = "distroless/base", +) + +container_pull( + name = "go_debug_image_base", + digest = "sha256:efd8711717d9e9b5d0dbb20ea10876dab0609c923bc05321b912f9239090ca80", + registry = "gcr.io", + repository = "distroless/base", +) + container_pull( name = "alpine_cc_linux_amd64", digest = "sha256:752aa0c9a88461ffc50c5267bb7497ef03a303e38b2c8f7f2ded9bebe5f1f00e", diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel index 1e75970d1..92834bbf8 100644 --- a/tools/BUILD.bazel +++ b/tools/BUILD.bazel @@ -1,8 +1,6 @@ load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") load("@io_bazel_rules_docker//contrib:passwd.bzl", "passwd_entry", "passwd_file") load("@io_bazel_rules_docker//container:container.bzl", "container_image") -load("@io_bazel_rules_docker//cc:image.bzl", CC_DEFAULT_BASE = "DEFAULT_BASE") -load("@io_bazel_rules_docker//go:image.bzl", GO_DEFAULT_BASE = "DEFAULT_BASE") load("//tools:build_settings.bzl", "base_image") sh_binary( @@ -50,6 +48,20 @@ pkg_tar( tags = ["manual"], ) +CC_DEFAULT_BASE = select({ + "@io_bazel_rules_docker//:debug": "@cc_debug_image_base//image", + "@io_bazel_rules_docker//:fastbuild": "@cc_image_base//image", + "@io_bazel_rules_docker//:optimized": "@cc_image_base//image", + "//conditions:default": "@cc_image_base//image", +}) + +GO_DEFAULT_BASE = select({ + "@io_bazel_rules_docker//:debug": "@go_debug_image_base//image", + "@io_bazel_rules_docker//:fastbuild": "@go_image_base//image", + "@io_bazel_rules_docker//:optimized": "@go_image_base//image", + "//conditions:default": "@go_image_base//image", +}) + # Include it in our base image as a tar. container_image( name = "cc_image",