diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 27 |
2 files changed, 17 insertions, 12 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index bb917175..069255ed 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM golang:1.11-alpine3.9 ARG BRANCH=stable/hunter ARG OPENSTACK_TAG=stable/rocky diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index c4e5f3b1..24ea959d 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,15 +1,20 @@ FROM opnfv/functest-kubernetes-core:hunter -RUN apk --no-cache add --update curl libc6-compat && \ - K8S_TAG=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable-1.13.txt) && \ - case $(uname -m) in armv7l) ARCH=arm;; aarch64) ARCH=arm64;; x86_64) ARCH=amd64;; esac && \ - curl https://storage.googleapis.com/kubernetes-release/release/$K8S_TAG/bin/linux/$ARCH/kubectl \ - -s --output /usr/local/bin/kubectl && \ - curl https://storage.googleapis.com/kubernetes-release/release/$K8S_TAG/kubernetes-test-linux-$ARCH.tar.gz \ - -s --output /src/kubernetes-test-linux-$ARCH.tar.gz && \ - tar zxf /src/kubernetes-test-linux-$ARCH.tar.gz kubernetes/test/bin/e2e.test kubernetes/test/bin/ginkgo -C /src && \ - mv /src/kubernetes/test/bin/e2e.test /src/kubernetes/test/bin/ginkgo /usr/local/bin/ && \ - chmod +x /usr/local/bin/kubectl /usr/local/bin/e2e.test /usr/local/bin/ginkgo && \ - rm -r /src/kubernetes /src/kubernetes-test-linux-$ARCH.tar.gz +ARG K8S_TAG=v1.13.12 + +RUN apk --no-cache add --update make py-pip bash git \ + grep rsync linux-headers musl-dev findutils \ + libffi openssl libjpeg-turbo && \ + apk --no-cache add --virtual .build-deps --update \ + gcc python-dev libffi-dev openssl-dev libjpeg-turbo-dev && \ + git init /src/k8s.io/kubernetes && \ + (cd /src/k8s.io/kubernetes && \ + git fetch --tags https://github.com/kubernetes/kubernetes $K8S_TAG && \ + git checkout FETCH_HEAD && \ + make kubectl ginkgo && \ + make WHAT=test/e2e/e2e.test && \ + mv _output/bin/* /usr/local/bin) && \ + rm -r /src/k8s.io && \ + apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |