X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=docker%2Fk8s%2FDockerfile;h=5b60ed06aac38f9efdcf23cda56177bbfddcc548;hb=4604951d905df4a8a868007fae50f428b3edcf11;hp=34bdd7d87bb640df225fe812347e2979e9c3539c;hpb=288cd2eb7d5bdbce4963e95b5f03234027428055;p=validation.git diff --git a/docker/k8s/Dockerfile b/docker/k8s/Dockerfile index 34bdd7d..5b60ed0 100644 --- a/docker/k8s/Dockerfile +++ b/docker/k8s/Dockerfile @@ -22,6 +22,7 @@ ARG K8S_TAG=v1.13.0 # Install dependencies COPY pip-requirements.txt /wheels/requirements/pip-requirements.txt + RUN apk --no-cache add --update \ openssl \ python3 \ @@ -48,7 +49,9 @@ RUN if [ $(uname -m) == 'aarch64' ]; then HOST_ARCH=arm64; else HOST_ARCH=amd64; make kubectl ginkgo && \ make WHAT=test/e2e/e2e.test ARCH=$HOST_ARCH RUN go get -u -v github.com/heptio/sonobuoy -RUN git clone https://gerrit.akraino.org/r/validation /opt/akraino/validation/repo +RUN git clone https://gerrit.akraino.org/r/validation /opt/akraino/validation +RUN cat /opt/akraino/validation/bluval/requirements.txt >> \ + /wheels/requirements/pip-requirements.txt WORKDIR /wheels RUN pip3 install wheel @@ -59,14 +62,9 @@ FROM python:3.6-alpine3.9 COPY --from=build /src/k8s.io/kubernetes/_output/bin /usr/local/bin COPY --from=build /go/bin/sonobuoy /bin/sonobuoy COPY --from=build /wheels /wheels -COPY --from=build /opt/akraino/validation/repo /opt/akraino/validation/repo +COPY --from=build /opt/akraino/validation/ /opt/akraino/validation/ RUN pip3 install -r /wheels/requirements/pip-requirements.txt \ -f /wheels && \ rm -rf /wheels && \ rm -rf /root/.cache/pip/* - -# Set the default command for running the tests -CMD /usr/local/bin/robot --loglevel DEBUG \ - --outputdir /opt/akraino/validation/results/conformance \ - /opt/akraino/validation/repo/conformance/conformance.robot