Merge changes I11fdef41,I2b6cf113

* changes:
  Allow building aarch64 images
  Publish Docker Slicing Presentation

1 files changed, 16 insertions, 7 deletions

diff --git a/build.sh b/build.sh
index 18d2e58de..3b46cb06e 100644
--- a/build.sh
+++ b/build.sh
@@ -3,7 +3,7 @@
 set -e
 
 repo=${repo:-opnfv}
-dirs="\
+x86_64_dirs=${x86_64_dirs-"\
 docker/core \
 docker/healthcheck \
 docker/smoke \
@@ -11,14 +11,23 @@ docker/features \
 docker/components \
 docker/vnf \
 docker/parser \
-docker/restapi"
+docker/restapi"}
+aarch64_dirs=${aarch64_dirs-$(echo "${x86_64_dirs}" | sed -e "s|docker/vnf||" \
+    -e "s|docker/restapi||")}
 
-(cd docker && docker build -t "${repo}/functest" .)
-docker push "${repo}/functest"
+find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:x86_64-latest|g" {} +
+for dir in ${x86_64_dirs}; do
+    (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:x86_64-latest" .)
+    docker push "${repo}/functest-${dir##**/}:x86_64-latest"
+done
+find . -name Dockerfile -exec git checkout {} +
 
-for dir in ${dirs}; do
-    (cd ${dir} && docker build -t "${repo}/functest-${dir##**/}" .)
-    docker push "${repo}/functest-${dir##**/}"
+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-latest|g" {} +
+for dir in ${aarch64_dirs}; do
+    (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:aarch64-latest" .)
+    docker push "${repo}/functest-${dir##**/}:aarch64-latest"
 done
+find . -name Dockerfile -exec git checkout {} +
 
 exit $?