diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-17 17:54:19 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-17 17:54:19 +0200 |
| commit | 25f68f484d550a9e54fd0b5d19524c024ac420ba (patch) | |
| tree | 66a6f89f28cf122d729304bcec5dced14ff56e59 | |
| parent | facb16007f238d5bf633436f16b4d737990dacc7 (diff) | |
Take docker tag into account
It completes the previous patch [1]
[1] https://gerrit.opnfv.org/gerrit/#/c/61035/
Change-Id: Icd8244dad40f66d9bd549dbc3ceac7e426c06b9c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | build.sh | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -12,10 +12,10 @@ arm64_dirs=${arm64_dirs-${amd64_dirs}} build_opts=(--pull=true --no-cache --force-rm=true) find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-core|\ + -e "s|opnfv/functest-kubernetes-core:fraser|\ ${repo}/functest-kubernetes-core:amd64-fraser|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ + -e "s|opnfv/functest-kubernetes-healthcheck:fraser|\ ${repo}/functest-kubernetes-healthcheck:amd64-fraser|g" {} + for dir in ${amd64_dirs}; do (cd "${dir}" && @@ -34,10 +34,10 @@ find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ -e "s|alpine:3.7|multiarch/alpine:arm64-v3.7|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-core|\ + -e "s|opnfv/functest-kubernetes-core:fraser|\ ${repo}/functest-kubernetes-core:arm64-fraser|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ + -e "s|opnfv/functest-kubernetes-healthcheck:fraser|\ ${repo}/functest-kubernetes-healthcheck:arm64-fraser|g" {} + for dir in ${arm64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ |