summaryrefslogtreecommitdiffstats
path: root/build.sh
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:54:11 +0200
commit07dc65bb64c34db0d657e7f57ffc033927869923 (patch)
tree7768efde02acc305eb65f1962927a78db0e0ccfe /build.sh
parentda3b9ad5cd00cb401d082075320dcb0d1a2acd0b (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)
Diffstat (limited to 'build.sh')
-rw-r--r--build.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index 9f851218..18356fed 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-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 $?