From be3719a3577e2b0a087c821020a94841e8c34b57 Mon Sep 17 00:00:00 2001 From: "Wilson E. Husin" Date: Mon, 8 Mar 2021 16:18:10 -0800 Subject: [PATCH] Use distroless/base:latest for Conformance image Going with the guess that nonroot is the problem of creating /tmp/results/e2e.log in container Removing manual creation of /tmp/results as well --- cluster/images/conformance/Dockerfile | 4 ---- cluster/images/conformance/Makefile | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cluster/images/conformance/Dockerfile b/cluster/images/conformance/Dockerfile index 90067615514..7172005dbce 100644 --- a/cluster/images/conformance/Dockerfile +++ b/cluster/images/conformance/Dockerfile @@ -15,13 +15,9 @@ ARG BASEIMAGE FROM gcr.io/k8s-staging-build-image/debian-base:v2.1.3 as base -RUN mkdir /tmp/results \ - && chown 65532 /tmp/results # Distroless nonroot UID FROM ${BASEIMAGE} -COPY --from=base /tmp/results /tmp - # This is a dependency for `kubectl diff` tests COPY --from=base /usr/bin/diff /usr/local/bin/ diff --git a/cluster/images/conformance/Makefile b/cluster/images/conformance/Makefile index fbda4feef8b..b08aa1f319d 100644 --- a/cluster/images/conformance/Makefile +++ b/cluster/images/conformance/Makefile @@ -31,7 +31,7 @@ E2E_GO_RUNNER_BIN?=$(shell test -f $(LOCAL_OUTPUT_PATH)/go-runner && echo $(LOCA CLUSTER_DIR?=$(shell pwd)/../../../cluster/ -BASEIMAGE=gcr.io/distroless/base:nonroot +BASEIMAGE=gcr.io/distroless/base:latest TEMP_DIR:=$(shell mktemp -d -t conformanceXXXXXX) all: build