diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-10-13 10:38:38 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-10-13 10:38:38 +0200 |
| commit | a8acc48148313229b4e6771374ece9256d75b26c (patch) | |
| tree | 7de522fe006a3cfd7123e490eb0b5e7d07a30500 /build.sh | |
| parent | b31ae2c8b59619251cffcba1f307e0b7b9acd89d (diff) | |
Conform with Docker ARCH names
It switches Docker tags:
- x86_64 -> amd64
- aarch64 -> arm64
Change-Id: I05575dd728e7502a891a3ee3015f81ac8e3f7a92
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'build.sh')
| -rw-r--r-- | build.sh | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -3,7 +3,7 @@ set -e repo=${repo:-opnfv} -x86_64_dirs=${x86_64_dirs-"\ +amd64_dirs=${x86_64_dirs-"\ docker/core \ docker/healthcheck \ docker/smoke \ @@ -12,21 +12,21 @@ docker/components \ docker/vnf \ docker/parser \ docker/restapi"} -aarch64_dirs=${aarch64_dirs-$(echo "${x86_64_dirs}" | sed -e "s|docker/vnf||" \ +arm64_dirs=${aarch64_dirs-$(echo "${amd64_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-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" +find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} + +for dir in ${amd64_dirs}; do + (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:amd64-latest" .) + docker push "${repo}/functest-${dir##**/}:amd64-latest" 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-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" +find . -name Dockerfile -exec sed -i -e "s|alpine:3.6|multiarch/alpine:arm64-v3.6|g" {} + +find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} + +for dir in ${arm64_dirs}; do + (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:arm64-latest" .) + docker push "${repo}/functest-${dir##**/}:arm64-latest" done find . -name Dockerfile -exec git checkout {} + |