diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-11 22:45:56 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-11 22:45:56 +0200 |
| commit | c4c3285009ee2fbb0eb9912e14d97ef54a71dcc4 (patch) | |
| tree | e2a488dc8bf7563dd08b795ab3b963fb1e77f818 | |
| parent | 69416fdd92439f2d81b664e1c263bb114fd6af14 (diff) | |
Fix sed if arm in build.sh
Change-Id: Idc56d20474a97f5d2e48ab9b8f8a8af269852208
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | build.sh | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -56,12 +56,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.12-alpine3.9|arm32v7/golang:1.12-alpine3.9|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-core|\ + -e "s|opnfv/functest-kubernetes-core:iruya|\ ${repo}/functest-kubernetes-core:arm-iruya|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ + -e "s|opnfv/functest-kubernetes-healthcheck:iruya|\ ${repo}/functest-kubernetes-healthcheck:arm-iruya|g" {} + for dir in ${arm_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ @@ -73,7 +73,7 @@ for dir in ${arm_dirs}; do done [ ! -z "${arm_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm-iruya" \ - arm32v7/golang:1.14-alpine3.12 || true) + arm32v7/golang:1.12-alpine3.9 || true) find . -name Dockerfile -exec git checkout {} + exit $? |