Code Review
/
validation.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[VAL-92] OS layer image UTF-8 issue
[validation.git]
/
docker
/
k8s
/
Dockerfile
diff --git
a/docker/k8s/Dockerfile
b/docker/k8s/Dockerfile
index
5b60ed0
..
43c6d80
100644
(file)
--- a/
docker/k8s/Dockerfile
+++ b/
docker/k8s/Dockerfile
@@
-17,13
+17,17
@@
# ref: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#use-multi-stage-builds
FROM golang:alpine3.9 as build
# ref: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#use-multi-stage-builds
FROM golang:alpine3.9 as build
-# Sonobuoy supports Kubernetes versions 1.11, 1.12 and 1.13
-ARG K8S_TAG=v1.13.0
+# Sonobuoy supports 3 Kubernetes minor versions: the current release and 2
+# minor versions before.
+ARG SB_TAG=v0.16.1
+# Determine the latest stable git tag at build time based on stable major version
+ARG K8S_VER=1.16
# Install dependencies
COPY pip-requirements.txt /wheels/requirements/pip-requirements.txt
RUN apk --no-cache add --update \
# Install dependencies
COPY pip-requirements.txt /wheels/requirements/pip-requirements.txt
RUN apk --no-cache add --update \
+ curl \
openssl \
python3 \
bash \
openssl \
python3 \
bash \
@@
-45,10
+49,14
@@
RUN git clone https://github.com/kubernetes/kubernetes /src/k8s.io/kubernetes
RUN if [ $(uname -m) == 'aarch64' ]; then HOST_ARCH=arm64; else HOST_ARCH=amd64; fi && \
echo "Building docker on $HOST_ARCH" && \
cd /src/k8s.io/kubernetes && \
RUN if [ $(uname -m) == 'aarch64' ]; then HOST_ARCH=arm64; else HOST_ARCH=amd64; fi && \
echo "Building docker on $HOST_ARCH" && \
cd /src/k8s.io/kubernetes && \
- git checkout $K8S_TAG && \
+ git checkout $(curl \
+ https://storage.googleapis.com/kubernetes-release/release/stable-$K8S_VER.txt) && \
make kubectl ginkgo && \
make WHAT=test/e2e/e2e.test ARCH=$HOST_ARCH
make kubectl ginkgo && \
make WHAT=test/e2e/e2e.test ARCH=$HOST_ARCH
-RUN go get -u -v github.com/heptio/sonobuoy
+RUN go get -d github.com/heptio/sonobuoy && \
+ cd /go/src/github.com/heptio/sonobuoy && \
+ git checkout $SB_TAG && \
+ go install
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
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