diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-10-18 17:50:11 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-10-18 18:54:11 +0200 |
| commit | 07dc65bb64c34db0d657e7f57ffc033927869923 (patch) | |
| tree | 7768efde02acc305eb65f1962927a78db0e0ccfe | |
| parent | da3b9ad5cd00cb401d082075320dcb0d1a2acd0b (diff) | |
Switch to golang:alpine3.8 as based image
It fixes all issues raised by the Alpine testing go package [1].
It conforms with Kubernetes which requires the latest go version.
[1] https://build.opnfv.org/ci/job/functest-kubernetes-healthcheck-docker-build-amd64-master/45/console
Change-Id: I388c843a21af9763703a40586ecf9b0b4583ebcb
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit e48f491529032b8dd009843976545febaddb0b7b)
| -rw-r--r-- | build.sh | 6 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 3 |
3 files changed, 5 insertions, 6 deletions
@@ -28,11 +28,11 @@ for dir in ${amd64_dirs}; do done [ ! -z "${amd64_dirs}" ] && (docker rmi \ - "${repo}/functest-kubernetes-core:amd64-hunter" alpine:3.8 || true) + "${repo}/functest-kubernetes-core:amd64-hunter" golang:alpine3.8 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.8|multiarch/alpine:arm64-v3.8|g" {} + + -e "s|golang:alpine3.8|arm64v8/golang:alpine3.8|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core:hunter|\ ${repo}/functest-kubernetes-core:arm64-hunter|g" {} + @@ -49,7 +49,7 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-hunter" \ - multiarch/alpine:arm64-v3.8 || true) + arm64v8/golang:alpine3.8 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index c7373c14..e6b2b0c6 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM golang:alpine3.8 ARG BRANCH=stable/hunter ARG OPENSTACK_TAG=stable/rocky diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 0bbbc7b8..1097fe4f 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -5,9 +5,8 @@ ARG K8S_TAG=v1.11.3 RUN apk --no-cache add --update make py-pip bash git \ grep rsync linux-headers musl-dev findutils \ libffi libssl1.0 libjpeg-turbo && \ - apk --no-cache add 'go>1.10.2' --repository http://dl-cdn.alpinelinux.org/alpine/edge/community && \ apk --no-cache add --virtual .build-deps --update \ - python-dev libffi-dev openssl-dev libjpeg-turbo-dev && \ + 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 && \ |