You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ch...@apache.org on 2014/08/30 10:09:41 UTC
git commit: add image version to docker run script
Repository: stratos
Updated Branches:
refs/heads/master f1285a8bb -> a008915eb
add image version to docker run script
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a008915e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a008915e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a008915e
Branch: refs/heads/master
Commit: a008915ebde2c6c92baa3cfebd090a6026618e44
Parents: f1285a8
Author: Chris Snow <ch...@apache.org>
Authored: Sat Aug 30 08:09:11 2014 +0000
Committer: Chris Snow <ch...@apache.org>
Committed: Sat Aug 30 08:09:20 2014 +0000
----------------------------------------------------------------------
tools/stratos-docker-images/run-example.sh | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a008915e/tools/stratos-docker-images/run-example.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-docker-images/run-example.sh b/tools/stratos-docker-images/run-example.sh
index ae47125..fdc63d2 100755
--- a/tools/stratos-docker-images/run-example.sh
+++ b/tools/stratos-docker-images/run-example.sh
@@ -30,6 +30,9 @@ export DOMAIN=example.com
# Set the IP_ADDR to the IP address you use to reach the docker host
export IP_ADDR=192.168.56.5
+# Set the version of Stratos docker images
+export STRATOS_VERSION=4.1.0-SNAPSHOT
+
########
# Bind
########
@@ -38,14 +41,14 @@ export IP_ADDR=192.168.56.5
# See http://www.zytrax.com/books/dns/ch7/address_match_list.html for more info
export UPDATE_ADDR_LIST=any
-export BIND_ID=$(docker run -d -p 53:53/udp -e "DOMAIN=$DOMAIN" -e "IP_ADDR=$IP_ADDR" -e "UPDATE_ADDR_LIST=$UPDATE_ADDR_LIST" apachestratos/bind); sleep 2s;
+export BIND_ID=$(docker run -d -p 53:53/udp -e "DOMAIN=$DOMAIN" -e "IP_ADDR=$IP_ADDR" -e "UPDATE_ADDR_LIST=$UPDATE_ADDR_LIST" apachestratos/bind:$STRATOS_VERSION); sleep 2s;
export BIND_IP_ADDR=$(docker inspect --format '{{ .NetworkSettings.Gateway }}' $BIND_ID)
###########
# ActiveMQ
###########
-export MB_ID=$(docker run -p 61616 -d apachestratos/activemq); sleep 2s;
+export MB_ID=$(docker run -p 61616 -d apachestratos/activemq:$STRATOS_VERSION); sleep 2s;
export MB_IP_ADDR=$(docker inspect --format '{{ .NetworkSettings.Gateway }}' $MB_ID)
export MB_PORT=$(docker port $MB_ID 61616 | awk -F':' '{ print $2 }')
@@ -69,7 +72,7 @@ rm -f addpuppetdomain.txt
export MASTERHOSTNAME=puppet.$DOMAIN
export TRUSTSTORE_PASSWORD=wso2carbon
-export PUPPET_ID=$(docker run -d -h ${MASTERHOSTNAME} --dns=${BIND_IP_ADDR} -e "DOMAIN=${DOMAIN}" -e "MASTERHOSTNAME=${MASTERHOSTNAME}" -e "MB_HOSTNAME=${MB_IP_ADDR}" -e "MB_PORT=${MB_PORT}" -e "TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD}" -p 8140 apachestratos/puppetmaster); sleep 2s;
+export PUPPET_ID=$(docker run -d -h ${MASTERHOSTNAME} --dns=${BIND_IP_ADDR} -e "DOMAIN=${DOMAIN}" -e "MASTERHOSTNAME=${MASTERHOSTNAME}" -e "MB_HOSTNAME=${MB_IP_ADDR}" -e "MB_PORT=${MB_PORT}" -e "TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD}" -p 8140 apachestratos/puppetmaster:$STRATOS_VERSION); sleep 2s;
export PUPPET_IP_ADDR=$(docker inspect --format '{{ .NetworkSettings.Gateway }}' $PUPPET_ID)
export PUPPET_PORT=$(docker port $PUPPET_ID 8140 | awk -F':' '{ print $2 }')
@@ -77,7 +80,7 @@ export PUPPET_PORT=$(docker port $PUPPET_ID 8140 | awk -F':' '{ print $2 }')
# MySQL
########
-export USERSTORE_ID=$(docker run -d -p 3306 -e MYSQL_ROOT_PASSWORD=password apachestratos/mysql); sleep 2s;
+export USERSTORE_ID=$(docker run -d -p 3306 -e MYSQL_ROOT_PASSWORD=password apachestratos/mysql:$STRATOS_VERSION); sleep 2s;
export USERSTORE_IP_ADDR=$(docker inspect --format '{{ .NetworkSettings.Gateway }}' $USERSTORE_ID)
export USERSTORE_PORT=$(docker port $USERSTORE_ID 3306 | awk -F':' '{ print $2 }')
@@ -126,5 +129,5 @@ docker_env+=(-e "VCLOUD_ENDPOINT=none")
docker_env+=(-e "STRATOS_PROFILE=default")
# Start Stratos container as daemon
-STRATOS_ID=$(docker run -d "${docker_env[@]}" -p 9443:9443 apachestratos/stratos)
+STRATOS_ID=$(docker run -d "${docker_env[@]}" -p 9443:9443 apachestratos/stratos:$STRATOS_VERSION)
sudo docker logs -f $STRATOS_ID