diff options
| author |   Jingzhao Ni <jingzhao.ni@arm.com> | 2018-08-17 16:58:58 +0800 |
|---|---|---|
| committer |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-17 13:43:28 +0200 |
| commit | a540530c66dbd78b83554e22064728c7c03801ea (patch) | |
| tree | 67f36b00644eaad75a4cb6bea78b524f297b7d73 | |
| parent | 816438f37e1a47bb3408c89d982c3fc37f893b64 (diff) | |
Add some build option in build.sh for supporting arm arch
In build.sh, add some build options for arm arch.
It also updates constraints to OpenStack Queens.
Co-Authored-By: Cédric Ollivier <cedric.ollivier@orange.com>
Change-Id: I3cc6c10e2e52c281e2324d8b42b721383be30c0b
Signed-off-by: Jingzhao Ni <jingzhao.ni@arm.com>
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | build.sh | 42 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 2 |
3 files changed, 35 insertions, 11 deletions
@@ -8,24 +8,48 @@ docker/core \ docker/healthcheck \ docker/smoke \ docker/features"} +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|${repo}/functest-kubernetes-core|g" \ - {} + + -e "s|opnfv/functest-kubernetes-core|\ +${repo}/functest-kubernetes-core:amd64-latest|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-healthcheck|\ -${repo}/functest-kubernetes-healthcheck|g" {} + +${repo}/functest-kubernetes-healthcheck:amd64-latest|g" {} + for dir in ${amd64_dirs}; do - (cd "${dir}" && docker build "${build_opts[@]}" \ - -t "${repo}/functest-kubernetes-${dir##**/}" .) - #docker push "${repo}/functest-kubernetes-${dir##**/}" + (cd "${dir}" && + docker build "${build_opts[@]}" \ + -t "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" [ "${dir}" != "docker/core" ] && - (docker rmi "${repo}/functest-kubernetes-${dir##**/}" || true) + (docker rmi \ + "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" || true) done [ ! -z "${amd64_dirs}" ] && - (docker rmi "${repo}/functest-kubernetes-healthcheck" \ - "${repo}/functest-kubernetes-core" alpine:3.7 || true) + (docker rmi \ + "${repo}/functest-kubernetes-core:amd64-latest" alpine:3.7 || true) +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|\ +${repo}/functest-kubernetes-core:arm64-latest|g" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-kubernetes-healthcheck|\ +${repo}/functest-kubernetes-healthcheck:arm64-latest|g" {} + +for dir in ${arm64_dirs}; do + (cd "${dir}" && docker build "${build_opts[@]}" \ + -t "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" + [ "${dir}" != "docker/core" ] && + (docker rmi \ + "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" || true) +done +[ ! -z "${arm64_dirs}" ] && + (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ + multiarch/alpine:arm64-v3.7 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index f07f4da3..d48980de 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.7 ARG BRANCH=master -ARG OPENSTACK_TAG=stable/pike +ARG OPENSTACK_TAG=stable/queens ARG OPNFV_TAG=master RUN apk --no-cache add --update python py-pip bash git grep && \ diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index e1c82e4c..9b626d3b 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -1,6 +1,6 @@ FROM opnfv/functest-kubernetes-core -ARG OPENSTACK_TAG=stable/pike +ARG OPENSTACK_TAG=stable/queens ARG OPNFV_TAG=master RUN apk --no-cache add --update make py-pip bash git go \ |