Code Review
/
validation.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add Docker Bench for Security"
[validation.git]
/
docker
/
k8s
/
Dockerfile
diff --git
a/docker/k8s/Dockerfile
b/docker/k8s/Dockerfile
index
1d41d00
..
5b60ed0
100644
(file)
--- 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
# Install dependencies
COPY pip-requirements.txt /wheels/requirements/pip-requirements.txt
+
RUN apk --no-cache add --update \
openssl \
python3 \
RUN apk --no-cache add --update \
openssl \
python3 \
@@
-48,6
+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
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
+RUN cat /opt/akraino/validation/bluval/requirements.txt >> \
+ /wheels/requirements/pip-requirements.txt
WORKDIR /wheels
RUN pip3 install wheel
WORKDIR /wheels
RUN pip3 install wheel
@@
-58,6
+62,7
@@
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 /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/ /opt/akraino/validation/
RUN pip3 install -r /wheels/requirements/pip-requirements.txt \
-f /wheels && \
RUN pip3 install -r /wheels/requirements/pip-requirements.txt \
-f /wheels && \