X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=build.sh;h=d882997f96d71ebb2c1c0361ad6828809cfcec70;hb=refs%2Fchanges%2F16%2F68216%2F1;hp=a186f4961b1dff4f39dba179700b8ac5e8981334;hpb=47e68332637d9b72888c79201b41ea424ac35a22;p=functest-kubernetes.git diff --git a/build.sh b/build.sh index a186f496..d882997f 100644 --- a/build.sh +++ b/build.sh @@ -28,11 +28,12 @@ for dir in ${amd64_dirs}; do done [ ! -z "${amd64_dirs}" ] && (docker rmi \ - "${repo}/functest-kubernetes-core:amd64-hunter" golang:1.11.6-alpine3.9 || true) + "${repo}/functest-kubernetes-core:amd64-hunter" \ + golang:1.11-alpine3.9 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.11.6-alpine3.9|arm64v8/golang:1.11.6-alpine3.9|g" {} + + -e "s|golang:1.11-alpine3.9|arm64v8/golang:1.11-alpine3.9|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core:hunter|\ ${repo}/functest-kubernetes-core:arm64-hunter|g" {} + @@ -49,7 +50,7 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-hunter" \ - arm64v8/golang:1.11.6-alpine3.9 || true) + arm64v8/golang:1.11-alpine3.9 || true) find . -name Dockerfile -exec git checkout {} + exit $?