From 26f223fa6ed5e80898c097cad8c46ce116fbaa95 Mon Sep 17 00:00:00 2001 From: Dave Chen Date: Mon, 5 Jul 2021 13:47:55 +0800 Subject: [PATCH 1/2] Bump `distroless/base` image to latest version `distroless/base:latest` is a multi-arched image now, this will help the `kubemark` works properly on the platforms other than `amd64` Signed-off-by: Dave Chen --- cluster/images/kubemark/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cluster/images/kubemark/Dockerfile b/cluster/images/kubemark/Dockerfile index e606d856ad3..c0aa111fddf 100644 --- a/cluster/images/kubemark/Dockerfile +++ b/cluster/images/kubemark/Dockerfile @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# The line below points to distroless/base as of 2019-11-15. The SHA should be -# kept in sycn with distroless_base definition in the WORKSPACE file. -FROM gcr.io/distroless/base@sha256:7fa7445dfbebae4f4b7ab0e6ef99276e96075ae42584af6286ba080750d6dfe5 +FROM gcr.io/distroless/base:latest COPY kubemark /kubemark From b6b1674f560ec50870090b87f9e1b11af20d82e6 Mon Sep 17 00:00:00 2001 From: Dave Chen Date: Tue, 6 Jul 2021 10:57:11 +0800 Subject: [PATCH 2/2] Switch to the version instead of the `latest` --- cluster/images/kubemark/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cluster/images/kubemark/Dockerfile b/cluster/images/kubemark/Dockerfile index c0aa111fddf..599b778189e 100644 --- a/cluster/images/kubemark/Dockerfile +++ b/cluster/images/kubemark/Dockerfile @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM gcr.io/distroless/base:latest +# The line below points to distroless/base as of 2021-06-29. The SHA should be +# kept in sycn with distroless_base definition in the WORKSPACE file. +FROM gcr.io/distroless/base@sha256:5e3fac1733c75e0e879a9770724e3960610a5cfbbfb5366559fbc334fe86c249 COPY kubemark /kubemark