summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-10-13 09:33:38 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-10-13 09:33:38 +0200
commit188f6330f4c941e0b582116f9161b7b82528e2a7 (patch)
treefb87976fc5a2d0f29856a1e9e0a66b2770ec31bf
parent416e3421636a4f4f8fde8c41f0911f47e4dbc150 (diff)
Fix find calls in build.sh
It completes "Allow building aarch64 images" [1] [1] https://gerrit.opnfv.org/gerrit/#/c/44931/ Change-Id: I5dcb98be7f296227693d3f889c9747d944bcc86d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--build.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/build.sh b/build.sh
index f16fa299f..c70ca0cf8 100644
--- a/build.sh
+++ b/build.sh
@@ -15,7 +15,7 @@ docker/restapi"}
aarch64_dirs=${aarch64_dirs-$(echo "${x86_64_dirs}" | sed -e "s|docker/vnf||" \
-e "s|docker/restapi||")}
-find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:x86_64-euphrates|g" {} +
+find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core:euphrates|${repo}/functest-core:x86_64-euphrates|g" {} +
for dir in ${x86_64_dirs}; do
(cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:x86_64-euphrates" .)
docker push "${repo}/functest-${dir##**/}:x86_64-euphrates"
@@ -23,7 +23,7 @@ done
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i -e "s|alpine:3.6|multiarch/alpine:aarch64-v3.6|g" {} +
-find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:aarch64-euphrates|g" {} +
+find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core:euphrates|${repo}/functest-core:aarch64-euphrates|g" {} +
for dir in ${aarch64_dirs}; do
(cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:aarch64-euphrates" .)
docker push "${repo}/functest-${dir##**/}:aarch64-euphrates"