aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-10-18 17:50:11 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-10-18 18:55:36 +0200
commit99114ec00dcbf110b10546f6222d9f469f100d21 (patch)
tree826c948ccbe489c4d9057c683fd5ef923e7685d5
parent7ba6bd70595d10b9825090337f6d4a75f2d7c51e (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.sh6
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--docker/healthcheck/Dockerfile3
3 files changed, 5 insertions, 6 deletions
diff --git a/build.sh b/build.sh
index 20f3c6b5..4ebed7d4 100644
--- a/build.sh
+++ b/build.sh
@@ -28,11 +28,11 @@ for dir in ${amd64_dirs}; do
done
[ ! -z "${amd64_dirs}" ] &&
(docker rmi \
- "${repo}/functest-kubernetes-core:amd64-gambia" alpine:3.8 || true)
+ "${repo}/functest-kubernetes-core:amd64-gambia" 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:gambia|\
${repo}/functest-kubernetes-core:arm64-gambia|g" {} +
@@ -49,7 +49,7 @@ for dir in ${arm64_dirs}; do
done
[ ! -z "${arm64_dirs}" ] &&
(docker rmi "${repo}/functest-kubernetes-core:arm64-gambia" \
- 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 f1d4d34f..50d79c4a 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.8
+FROM golang:alpine3.8
ARG BRANCH=stable/gambia
ARG OPENSTACK_TAG=stable/queens
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index c1cb3648..cf6bc7e5 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 && \