Repository: stratos Updated Branches: refs/heads/master 5ab240d50 -> 15d8343c8
add puppettestnode to build and push scripts Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/15d8343c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/15d8343c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/15d8343c Branch: refs/heads/master Commit: 15d8343c8dfbff1463f8fc860729a256e40a173e Parents: 5ab240d Author: Chris Snow <[email protected]> Authored: Mon Aug 25 21:23:07 2014 +0000 Committer: Chris Snow <[email protected]> Committed: Mon Aug 25 21:23:07 2014 +0000 ---------------------------------------------------------------------- tools/stratos-docker-images/build-all.sh | 4 ++++ tools/stratos-docker-images/puppettestnode/run-example.sh | 6 +----- tools/stratos-docker-images/push-all.sh | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/15d8343c/tools/stratos-docker-images/build-all.sh ---------------------------------------------------------------------- diff --git a/tools/stratos-docker-images/build-all.sh b/tools/stratos-docker-images/build-all.sh index 5e9cf3a..a57568a 100755 --- a/tools/stratos-docker-images/build-all.sh +++ b/tools/stratos-docker-images/build-all.sh @@ -32,6 +32,10 @@ cd puppetmaster ./docker-build.sh cd .. +cd puppettestnode +./docker-build.sh +cd .. + cd mysql ./docker-build.sh cd .. http://git-wip-us.apache.org/repos/asf/stratos/blob/15d8343c/tools/stratos-docker-images/puppettestnode/run-example.sh ---------------------------------------------------------------------- diff --git a/tools/stratos-docker-images/puppettestnode/run-example.sh b/tools/stratos-docker-images/puppettestnode/run-example.sh index e7105d7..c4ba8cb 100755 --- a/tools/stratos-docker-images/puppettestnode/run-example.sh +++ b/tools/stratos-docker-images/puppettestnode/run-example.sh @@ -32,9 +32,5 @@ EOF nsupdate addpuppettestnode.txt rm -f addpuppettestnode.txt -export DNS_IP_ADDR=172.17.42.1 - -echo Setting DNS to $DNS_IP_ADDR - -docker run -i -t --dns=$DNS_IP_ADDR -h testnode.$DOMAIN -e "PUPPET_HOST=puppet.$DOMAIN" -e "PUPPET_PORT=$PUPPET_PORT" apachestratos/puppettestnode /bin/bash +docker run -d=false -i -t --dns=$BIND_IP_ADDR -h testnode.$DOMAIN -e "PUPPET_HOST=puppet.$DOMAIN" -e "PUPPET_PORT=$PUPPET_PORT" apachestratos/puppettestnode http://git-wip-us.apache.org/repos/asf/stratos/blob/15d8343c/tools/stratos-docker-images/push-all.sh ---------------------------------------------------------------------- diff --git a/tools/stratos-docker-images/push-all.sh b/tools/stratos-docker-images/push-all.sh index 706e75b..abee36d 100755 --- a/tools/stratos-docker-images/push-all.sh +++ b/tools/stratos-docker-images/push-all.sh @@ -30,6 +30,10 @@ cd puppetmaster docker push apachestratos/puppetmaster cd .. +cd puppettestnode +docker push apachestratos/puppettestnode +cd .. + cd mysql docker push apachestratos/mysql cd ..
