Skip to content

Commit

Permalink
Use distroless/base:latest for Conformance image
Browse files Browse the repository at this point in the history
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
  • Loading branch information
wilsonehusin committed Mar 9, 2021
1 parent 6d52c00 commit be3719a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions cluster/images/conformance/Dockerfile
Expand Up @@ -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/

Expand Down
2 changes: 1 addition & 1 deletion cluster/images/conformance/Makefile
Expand Up @@ -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
Expand Down

0 comments on commit be3719a

Please sign in to comment.