From 720f7a60852ce7193189f3725133968c183cbef4 Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Tue, 28 Feb 2023 13:33:59 -0600 Subject: [PATCH] Update distroless base images --- WORKSPACE | 28 ++++++++++++++++------------ tools/BUILD.bazel | 16 ++++++++-------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index a090a32b32c5..5b0d43c81bf2 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -121,32 +121,36 @@ load( "container_pull", ) +# Pulled gcr.io/distroless/cc-debian11:latest on 2022-02-23 container_pull( - name = "cc_image_base", - digest = "sha256:41036fc7ed8df0f6addc18484cef0c94a85867508967789f947e11ffd5ff0cc8", + name = "cc_image_base_amd64", + digest = "sha256:2a0daf90a7deb78465bfca3ef2eee6e91ce0a5706059f05d79d799a51d339523", registry = "gcr.io", - repository = "distroless/cc", + repository = "distroless/cc-debian11", ) +# Pulled gcr.io/distroless/cc-debian11:debug on 2022-02-23 container_pull( - name = "cc_debug_image_base", - digest = "sha256:6865ad48467c89c3c3524d4c426f52ad12d9ab7dec31fad31fae69da40eb6445", + name = "cc_debug_image_base_amd64", + digest = "sha256:7bd596f5f200588f13a69c268eea6ce428b222b67cd7428d6a7fef95e75c052a", registry = "gcr.io", - repository = "distroless/cc", + repository = "distroless/cc-debian11", ) +# Pulled from gcr.io/distroless/base-debian11:latest on 2022-02-23 container_pull( - name = "go_image_base", - digest = "sha256:b9b124f955961599e72630654107a0cf04e08e6fa777fa250b8f840728abd770", + name = "go_image_base_amd64", + digest = "sha256:34e682800774ecbd0954b1663d90238505f1ba5543692dbc75feef7dd4839e90", registry = "gcr.io", - repository = "distroless/base", + repository = "distroless/base-debian11", ) +# Pulled from gcr.io/distroless/base-debian11:debug on 2022-02-23 container_pull( - name = "go_debug_image_base", - digest = "sha256:65668d2b78d25df3d8ccf5a778d017fcaba513b52078c700083eaeef212b9979", + name = "go_debug_image_base_amd64", + digest = "sha256:0f503c6bfd207793bc416f20a35bf6b75d769a903c48f180ad73f60f7b60d7bd", registry = "gcr.io", - repository = "distroless/base", + repository = "distroless/base-debian11", ) container_pull( diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel index 6c2c34298c02..9f6e1986e994 100644 --- a/tools/BUILD.bazel +++ b/tools/BUILD.bazel @@ -43,17 +43,17 @@ pkg_tar( ) 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", + "@io_bazel_rules_docker//:debug": "@cc_debug_image_base_amd64//image", + "@io_bazel_rules_docker//:fastbuild": "@cc_image_base_amd64//image", + "@io_bazel_rules_docker//:optimized": "@cc_image_base_amd64//image", + "//conditions:default": "@cc_image_base_amd64//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", + "@io_bazel_rules_docker//:debug": "@go_debug_image_base_amd64//image", + "@io_bazel_rules_docker//:fastbuild": "@go_image_base_amd64//image", + "@io_bazel_rules_docker//:optimized": "@go_image_base_amd64//image", + "//conditions:default": "@go_image_base_amd64//image", }) # Include it in our base image as a tar.