diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-11 22:47:19 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-11 22:47:19 +0200 |
| commit | 83e849ab232c54de49d7c066f0794d37baa78a32 (patch) | |
| tree | f0a21de9bff203eab5a0b05093fa2d05f94a1aa6 /build.sh | |
| parent | 1d7be777356eea7c46fbb34f683e3a896536f358 (diff) | |
Fix sed if arm in build.sh
Change-Id: I2fbba9004886c72b4213e7b69bac8374af77a5ab
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'build.sh')
| -rw-r--r-- | build.sh | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -55,12 +55,12 @@ done find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.14-alpine3.12|arm32v7/golang:1.14-alpine3.12|g" {} + + -e "s|golang:1.11-alpine3.9|arm32v7/golang:1.11-alpine3.9|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-core|\ + -e "s|opnfv/functest-kubernetes-core:hunter|\ ${repo}/functest-kubernetes-core:arm-hunter|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ + -e "s|opnfv/functest-kubernetes-healthcheck:hunter|\ ${repo}/functest-kubernetes-healthcheck:arm-hunter|g" {} + for dir in ${arm_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ @@ -72,7 +72,7 @@ for dir in ${arm_dirs}; do done [ ! -z "${arm_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm-hunter" \ - arm32v7/golang:1.14-alpine3.12 || true) + arm32v7/golang:1.11-alpine3.9 || true) find . -name Dockerfile -exec git checkout {} + exit $? |