diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-07-19 09:32:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-19 09:32:25 +0000 |
| commit | 2f911f3f0500b3a1a0f5352282e88e2aea925a6d (patch) | |
| tree | a6408ad63191bac77260252402d9fcc13b25048d | |
| parent | 0e593e964c648d8794b7945d77ae9dd41c7e59ac (diff) | |
| parent | 6ff8e6fd6be9f1fc57506db52432a1cb20f4db99 (diff) | |
Merge "Add script to build all containers"
| -rw-r--r-- | build.sh | 15 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/healthcheck/hooks/build | 7 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/hooks/build | 7 |
5 files changed, 31 insertions, 2 deletions
diff --git a/build.sh b/build.sh new file mode 100644 index 00000000..dbc79e0d --- /dev/null +++ b/build.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e + +repo=${repo:-opnfv} + +(cd docker && docker build -t "${repo}/functest" .) +docker push "${repo}/functest" + +for dir in docker/core docker/healthcheck docker/smoke; do + (cd ${dir} && docker build -t "${repo}/functest-${dir##**/}" .) + docker push "${repo}/functest-${dir##**/}" +done + +exit $? diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 6dfea7f8..8923e4cd 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,4 +1,4 @@ -FROM ollivier/functest-core +FROM opnfv/functest-core COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml CMD ["bash","-c","prepare_env start && run_tests -t all"] diff --git a/docker/healthcheck/hooks/build b/docker/healthcheck/hooks/build new file mode 100644 index 00000000..e5d15b52 --- /dev/null +++ b/docker/healthcheck/hooks/build @@ -0,0 +1,7 @@ +#!/bin/bash + +from="${DOCKER_REPO%/*}/functest-core" +sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile && + docker build -t "${IMAGE_NAME}" . + +exit $? diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index b6f84b64..15ab702d 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,4 +1,4 @@ -FROM ollivier/functest-core +FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=stable/ocata diff --git a/docker/smoke/hooks/build b/docker/smoke/hooks/build new file mode 100644 index 00000000..e5d15b52 --- /dev/null +++ b/docker/smoke/hooks/build @@ -0,0 +1,7 @@ +#!/bin/bash + +from="${DOCKER_REPO%/*}/functest-core" +sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile && + docker build -t "${IMAGE_NAME}" . + +exit $? |