From acba14f7535b60767ce1ad658c45d6dd20047edf Mon Sep 17 00:00:00 2001 From: morganrol Date: Tue, 19 Oct 2021 16:48:05 +0200 Subject: [SECURITY] Fix xtesting-security build xtesting-security not building since few days - remove kubebench reference - do not upgrade pip (options used for jube hunter no more supproted) Issue-ID: TEST-367 Signed-off-by: morganrol Change-Id: I882aae5b7122af51f5e4dd312f27efa219c75b19 --- security/docker/Dockerfile | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/security/docker/Dockerfile b/security/docker/Dockerfile index 9bfd2cc..3565653 100644 --- a/security/docker/Dockerfile +++ b/security/docker/Dockerfile @@ -4,12 +4,6 @@ RUN git clone https://github.com/mikefarah/yq.git --depth 1 WORKDIR /go/src/github.com/mikefarah/yq RUN CGO_ENABLED=0 go install -a -ldflags '-w -s -extldflags "-static"' -FROM golang:1.17 AS build_aqua -WORKDIR /go/src/github.com/aquasecurity/ -RUN git clone https://github.com/aquasecurity/kube-bench.git --depth 1 -WORKDIR /go/src/github.com/aquasecurity/kube-bench -RUN GO111MODULE=on CGO_ENABLED=0 go install -a -ldflags "-w" - FROM golang:1.17 AS build_onap WORKDIR /opt/onap RUN git clone https://git.onap.org/integration --depth 1 @@ -33,8 +27,6 @@ COPY scripts/check_unlimitted_pods.sh /check_unlimitted_pods.sh COPY scripts/check_cis_kubernetes.sh /check_cis_kubernetes.sh COPY scripts/check_versions.sh /check_versions.sh COPY --from=build_yq /go/bin/yq /usr/local/bin/yq -COPY --from=build_aqua /go/bin/kube-bench /usr/local/bin/kube-bench -COPY --from=build_aqua /go/src/github.com/aquasecurity/kube-bench/cfg/ /cfg/ COPY --from=build_onap /go/bin/sslendpoints /usr/local/bin/sslendpoints RUN set -x && \ @@ -55,11 +47,9 @@ RUN set -x && \ wget -O /check_versions/k8s_bin_versions_inspector.py https://git.onap.org/integration/plain/test/security/check_versions/src/k8s_bin_versions_inspector.py?h=$ONAP_TAG &&\ wget -O /check_versions/requirements.txt https://git.onap.org/integration/plain/test/security/check_versions/env/requirements.txt?h=$ONAP_TAG &&\ wget -O /check_versions/recommended_versions.yaml https://git.onap.org/integration/seccom/plain/recommended_versions.yaml?h=$ONAP_TAG &&\ - chmod +x /usr/local/bin/kube-bench && \ chmod +x /usr/local/bin/sslendpoints && \ chmod +x /check_*.sh && \ rm -rf /usr/lib/python3.8/site-packages/PyYAML* && \ - pip3 install --upgrade pip && \ pip3 install --no-cache-dir \ git+https://git.onap.org/integration/xtesting.git@$ONAP_TESTS_TAG#subdirectory=security && \ cd /kube-hunter && pip3 install -r /kube-hunter/requirements.txt && \ -- cgit 1.2.3-korg