X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build.sh;h=c5f8eeb5fb5794b115ed07e20c3ad24b586f4fc8;hb=6fa912328906d3073b6afe7acc2b39b2a895e538;hp=bfcd3264b180ffcbc4e5bef5ed3f8f803d520b5f;hpb=080d2414682d5fecea8c01640e2e5971278fe19d;p=functest-kubernetes.git diff --git a/build.sh b/build.sh index bfcd3264..c5f8eeb5 100644 --- a/build.sh +++ b/build.sh @@ -7,7 +7,8 @@ amd64_dirs=${amd64_dirs-"\ docker/core \ docker/healthcheck \ docker/smoke \ -docker/cnf"} +docker/cnf \ +docker/security"} arm64_dirs=${arm64_dirs-${amd64_dirs}} build_opts=(--pull=true --no-cache --force-rm=true) @@ -29,11 +30,11 @@ done [ ! -z "${amd64_dirs}" ] && (docker rmi \ "${repo}/functest-kubernetes-core:amd64-latest" \ - golang:1.13-alpine3.11 || true) + golang:1.13-alpine3.12 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.13-alpine3.11|arm64v8/golang:1.13-alpine3.11|g" {} + + -e "s|golang:1.14-alpine3.12|arm64v8/golang:1.14-alpine3.12|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm64-latest|g" {} + @@ -50,7 +51,7 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ - arm64v8/golang:1.13-alpine3.11 || true) + arm64v8/golang:1.14-alpine3.12 || true) find . -name Dockerfile -exec git checkout {} + exit $?