diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-11 22:41:27 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-11 22:41:27 +0200 |
| commit | 5535cd9bab2ab64a9d3cc3d08eb72e25e3b00b22 (patch) | |
| tree | 3c19d2284171227a86ca3fef79b0dabac2f24be0 | |
| parent | dfe7a9b84cec9f4025c01472d165d40065706518 (diff) | |
Fix sed if arm in build.sh
Change-Id: I797295abc7f1a33c96484fed2fd85d23c6fc1aeb
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.13-alpine3.11|arm32v7/golang:1.13-alpine3.11|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-core|\ + -e "s|opnfv/functest-kubernetes-core:kali|\ ${repo}/functest-kubernetes-core:arm-kali|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ + -e "s|opnfv/functest-kubernetes-healthcheck:kali|\ ${repo}/functest-kubernetes-healthcheck:arm-kali|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-kali" \ - arm32v7/golang:1.14-alpine3.12 || true) + arm32v7/golang:1.13-alpine3.11 || true) find . -name Dockerfile -exec git checkout {} + exit $? |