github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 20:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Use distroless to build Conformance image

Browse Source 
In order to avoid noisy / false positive CVE image scanning, Conformance
image is now be built based on Distroless.

Signed-off-by: Wilson Husin <whusin@vmware.com>
This commit is contained in:
Wilson Husin 2021-02-17 19:49:22 -08:00 committed by Wilson E. Husin
parent 7c702138f9
commit 4fafd1afef
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/images/conformance/Dockerfile
View File

@ -14,12 +14,17 @@
ARG BASEIMAGE ARG BASEIMAGE
FROM gcr.io/k8s-staging-build-image/debian-base:v2.1.3 as base
FROM ${BASEIMAGE} FROM ${BASEIMAGE}
# This is a dependency for `kubectl diff` tests
COPY --from=base /usr/bin/diff /usr/local/bin/
COPY ginkgo /usr/local/bin/ COPY ginkgo /usr/local/bin/
COPY e2e.test /usr/local/bin/ COPY e2e.test /usr/local/bin/
COPY kubectl /usr/local/bin/ COPY kubectl /usr/local/bin/
COPY run_e2e.sh /run_e2e.sh COPY gorunner /run_e2e.sh
COPY gorunner /gorunner COPY gorunner /gorunner
COPY cluster /kubernetes/cluster COPY cluster /kubernetes/cluster
WORKDIR /usr/local/bin WORKDIR /usr/local/bin
@ -32,4 +37,4 @@ ENV E2E_VERBOSITY="4"
ENV RESULTS_DIR="/tmp/results" ENV RESULTS_DIR="/tmp/results"
ENV KUBECONFIG="" ENV KUBECONFIG=""
CMD [ "/bin/bash", "-c", "/run_e2e.sh" ] CMD [ "/gorunner" ]

2
cluster/images/conformance/Makefile
View File

@ -31,7 +31,7 @@ E2E_GO_RUNNER_BIN?=$(shell test -f $(LOCAL_OUTPUT_PATH)/go-runner && echo $(LOCA
CLUSTER_DIR?=$(shell pwd)/../../../cluster/ CLUSTER_DIR?=$(shell pwd)/../../../cluster/
BASEIMAGE=debian:stable-slim BASEIMAGE=gcr.io/distroless/base:nonroot
TEMP_DIR:=$(shell mktemp -d -t conformanceXXXXXX) TEMP_DIR:=$(shell mktemp -d -t conformanceXXXXXX)
all: build all: build