Updated Dockerfiles for Stratos 4.1.1 release
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d5680aa8 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d5680aa8 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d5680aa8 Branch: refs/heads/data-publisher-integration Commit: d5680aa89d3de75a3c01e8cfa45c3ae149e37d78 Parents: 67576a8 Author: Akila Perera <[email protected]> Authored: Thu Aug 6 19:23:56 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Thu Aug 6 19:24:10 2015 +0530 ---------------------------------------------------------------------- README.md | 24 ++++++++++---------- .../src/test/python/README.md | 2 +- .../console/README.md | 2 +- .../jclouds/apis/vcloud/1.8.1-stratos/pom.xml | 2 +- pom.xml | 2 +- .../modules/distribution/INSTALL.txt | 2 +- products/stratos-cli/distribution/README.txt | 2 +- .../stratos/modules/distribution/INSTALL.txt | 2 +- .../stratos/modules/distribution/README.txt | 2 +- tools/config-scripts/ec2/config.sh | 2 +- tools/config-scripts/gce/config.sh | 2 +- tools/config-scripts/openstack/config.sh | 2 +- .../base-image/Dockerfile | 10 ++++---- .../base-image/files/run | 2 +- .../base-image/packs/.gitignore | 4 ++++ .../cartridge-docker-images/build.sh | 8 +++---- .../service-images/php/Dockerfile | 2 +- .../service-images/tomcat-saml-sso/Dockerfile | 2 +- .../service-images/tomcat/Dockerfile | 2 +- .../service-images/wso2is-saml-sso/Dockerfile | 2 +- .../stratos-docker-images/run-example.sh | 2 +- tools/puppet3/modules/agent/files/README.txt | 2 +- tools/puppet3/modules/haproxy/files/README.txt | 2 +- tools/puppet3/modules/lb/files/README.txt | 2 +- .../modules/python_agent/files/README.txt | 2 +- tools/stratos-installer/README.md | 4 ++-- tools/stratos-installer/conf/setup.conf | 2 +- 27 files changed, 49 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 28a8398..8d6b96b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Apache Stratos =========================== Apache Stratos includes polyglot language and environment support together with the ability to run on top of multiple IaaS runtimes. Stratos is licensed under the Apache License, Version 2.0 -The following are the key features available in Apache Stratos 4.1.0: +The following are the key features available in Apache Stratos 4.1.1: Features -------- @@ -46,13 +46,13 @@ auto-scaling policies with multiple factors,i.e., requests in flight, memory con considered when scaling up or down. The Auto-scaler also supports scaling for non-HTTP transport. <br /> For detailed information on how multi-factored auto-scaling takes place in Stratos, -see [Autoscaler](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Autoscaler). +see [Autoscaler](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Autoscaler). * Smart policies <br /> The Auto-scaler in Stratos uses two smart policies when making auto-scaling decisions: auto-scaling policy and deployment policy. The instances will be automatically spawned based on the smart policies that are applied to the application. <br /> -For more information on auto-scaling and deployment policy scaling policies, see [Smart Policies](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Smart+Policies). +For more information on auto-scaling and deployment policy scaling policies, see [Smart Policies](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Smart+Policies). * Multiple IaaS support <br /> Apache Stratos is tested on the following IaaS providers: AWS EC2 and OpenStack. However, it is very easy to extend @@ -66,7 +66,7 @@ be off-loaded to another cloud. * Controlling IaaS resources <br /> It is possible for DevOps to define partitions in a network partition, to control IaaS resources. Thereby, Apache Stratos can control resources per cloud, region, and zone. Controlling of IaaS resources provide a high -availability and solves disaster recovery concerns. For more information, see [Cloud Partitioning](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Cloud+Partitioning). +availability and solves disaster recovery concerns. For more information, see [Cloud Partitioning](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Cloud+Partitioning). * Loosely coupled communication <br /> Stratos uses the Advanced Message Queuing Protocol (AMQP) messaging technology for communication among all its components. @@ -85,7 +85,7 @@ A cartridge is a package of code that includes a Virtual Machine (VM) image plus be plugged into Stratos to offer a new PaaS service. Stratos supports single tenant and multi-tenant cartridges. If needed, tenants can easily add their own cartridges to Stratos. <br /> -For more information on how Stratos uses cartridges, see [Cartridge](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Cartridge). +For more information on how Stratos uses cartridges, see [Cartridge](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Cartridge). * Cartridge automation using Puppet <br /> Cartridges can be easily configured with the use of an orchestration layer such as Puppet. @@ -94,7 +94,7 @@ Cartridges can be easily configured with the use of an orchestration layer such Stratos supports third-party load balancers (LBs), i.e, HAProxy, NGINX. Thereby, if required, users can use their own LB with Stratos. <br /> -For more information, see [Load Balancers](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Load+Balancers). +For more information, see [Load Balancers](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Load+Balancers). * Artifact distribution coordination <br /> The Artifact Distribution Coordinator is responsible for the distribution of artifacts. Artifacts can be uploaded @@ -103,24 +103,24 @@ topology and send notifications to appropriate Cartridge instances. ADC supports repositories based deployment synchronization. Users are able to use their own Git repository to sync artifacts with a service instance. <br /> -For more information, see [Artifact Distribution Coordinator](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Artifact+Distribution+Coordinator). +For more information, see [Artifact Distribution Coordinator](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Artifact+Distribution+Coordinator). * Stratos Manager Console <br /> Administrators and tenants can use the Stratos Manager console, which is a web-based UI management console in Stratos, to interact with Stratos. <br /> -For more information, see [Stratos Manager](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Stratos+Manager). +For more information, see [Stratos Manager](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Stratos+Manager). * Stratos REST API <br /> DevOps can use REST APIs to carry out various administering functions (e.g., adding a tenant, adding a cartridge, etc.). <br /> -For more information, see the [Stratos API Reference Guide](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Stratos+API+Reference). +For more information, see the [Stratos API Reference Guide](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Stratos+API+Reference). * Interactive CLI Tool <br /> Command Line Interface (CLI) tool provides users an interface to interact with Stratos and manage your applications. <br /> -For more information, see the [CLI Tool](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+CLI+Tool) and the -[CLI Guide](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+CLI+Guide). +For more information, see the [CLI Tool](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+CLI+Tool) and the +[CLI Guide](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+CLI+Guide). * Monitoring and metering <br /> Apache Stratos provides centralized monitoring and metering. The level of resource utilization in Stratos is measured using metering. @@ -129,7 +129,7 @@ Apache Stratos provides centralized monitoring and metering. The level of resour If required, the DevOps can enable a persistent volume for cartridges. If persistent volume is enabled, Apache Stratos automatically attaches a volume when a new cartridge instance is created. <br /> -For more information, see [Persistence Volume Mapping](https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Persistence+Volume+Mapping). +For more information, see [Persistence Volume Mapping](https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Persistence+Volume+Mapping). * Gracefully shutdown instances <br /> Before terminating an instance, when scaling down, the Auto-scaler will allow all the existing requests to the instance http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/components/org.apache.stratos.cli/src/test/python/README.md ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/test/python/README.md b/components/org.apache.stratos.cli/src/test/python/README.md index 57cbfbb..4704069 100644 --- a/components/org.apache.stratos.cli/src/test/python/README.md +++ b/components/org.apache.stratos.cli/src/test/python/README.md @@ -18,7 +18,7 @@ Set the environment variables CLI_JAR, PYTHONPATH and WIREMOCK_JAR, WIREMOCK_HTT ``` # the stratos CLI_JAR -export CLI_JAR=~/stratos/components/org.apache.stratos.cli/target/org.apache.stratos.cli-4.1.0.jar +export CLI_JAR=~/stratos/components/org.apache.stratos.cli/target/org.apache.stratos.cli-4.1.1.jar # set the PYTHONPATH to include pexpect export PYTHONPATH=$PYTHONPATH:~/stratos/components/org.apache.stratos.cli/target/pexpect-3.2 http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/components/org.apache.stratos.manager.console/console/README.md ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/README.md b/components/org.apache.stratos.manager.console/console/README.md index ae53f7a..18e6c03 100644 --- a/components/org.apache.stratos.manager.console/console/README.md +++ b/components/org.apache.stratos.manager.console/console/README.md @@ -1,4 +1,4 @@ -##Stratos 4.1.0 New UXD Implemantation## +##Stratos 4.1.1 New UXD Implemantation## ==================================== Initial version with improved UXDesigns. http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml index c41f538..c731b6c 100644 --- a/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml +++ b/dependencies/jclouds/apis/vcloud/1.8.1-stratos/pom.xml @@ -126,6 +126,6 @@ </profiles> <scm> - <tag>4.1.0-rc4</tag> + <tag>4.1.1-SNAPSHOT</tag> </scm> </project> http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2f602b1..6296672 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/stratos.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/stratos.git</developerConnection> <url>https://git-wip-us.apache.org/repos/asf?p=stratos.git</url> - <tag>4.1.0-rc4</tag> + <tag>4.1.1-SNAPSHOT</tag> </scm> <modules> http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/products/load-balancer/modules/distribution/INSTALL.txt ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/distribution/INSTALL.txt b/products/load-balancer/modules/distribution/INSTALL.txt index dde8bf3..dd371ea 100644 --- a/products/load-balancer/modules/distribution/INSTALL.txt +++ b/products/load-balancer/modules/distribution/INSTALL.txt @@ -56,7 +56,7 @@ System Requirements Please refer following link for more information: -https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Installation+Guide +https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Installation+Guide http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/products/stratos-cli/distribution/README.txt ---------------------------------------------------------------------- diff --git a/products/stratos-cli/distribution/README.txt b/products/stratos-cli/distribution/README.txt index b342790..12f0e32 100755 --- a/products/stratos-cli/distribution/README.txt +++ b/products/stratos-cli/distribution/README.txt @@ -25,7 +25,7 @@ in the interactive mode. Configuring CLI Tool ================================== -Configuration guide can be found at https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Configuring+CLI+Tool +Configuration guide can be found at https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Configuring+CLI+Tool Help ================================== http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/products/stratos/modules/distribution/INSTALL.txt ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/INSTALL.txt b/products/stratos/modules/distribution/INSTALL.txt index 4344d36..bdf7360 100755 --- a/products/stratos/modules/distribution/INSTALL.txt +++ b/products/stratos/modules/distribution/INSTALL.txt @@ -64,4 +64,4 @@ System Requirements Please refer below link for more information: -https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Installation+Guide \ No newline at end of file +https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Installation+Guide \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/products/stratos/modules/distribution/README.txt ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/README.txt b/products/stratos/modules/distribution/README.txt index 989f20c..5150545 100755 --- a/products/stratos/modules/distribution/README.txt +++ b/products/stratos/modules/distribution/README.txt @@ -30,7 +30,7 @@ from instances and updates the routing topology periodically. Topology updates f Please refer below link for more information: -https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Architecture +https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Architecture Crypto Notice http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/config-scripts/ec2/config.sh ---------------------------------------------------------------------- diff --git a/tools/config-scripts/ec2/config.sh b/tools/config-scripts/ec2/config.sh index 880a778..4b49ea1 100755 --- a/tools/config-scripts/ec2/config.sh +++ b/tools/config-scripts/ec2/config.sh @@ -33,7 +33,7 @@ CP=`which cp` MV=`which mv` HOSTSFILE=/etc/hosts -LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.0/wso2carbon.lck +LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.1-SNAPSHOT/wso2carbon.lck DATE=`date +%d%m%y%S` RANDOMNUMBER="`${TR} -c -d 0-9 < /dev/urandom | ${HEAD} -c 4`${DATE}" http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/config-scripts/gce/config.sh ---------------------------------------------------------------------- diff --git a/tools/config-scripts/gce/config.sh b/tools/config-scripts/gce/config.sh index ab75b12..067ba8e 100644 --- a/tools/config-scripts/gce/config.sh +++ b/tools/config-scripts/gce/config.sh @@ -36,7 +36,7 @@ CURL=`which curl` HOSTSFILE=/etc/hosts DATE=`date +%d%m%y%S` RANDOMNUMBER="`${TR} -c -d 0-9 < /dev/urandom | ${HEAD} -c 4`${DATE}" -LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.0/wso2carbon.lck +LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.1-SNAPSHOT/wso2carbon.lck function valid_ip() { http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/config-scripts/openstack/config.sh ---------------------------------------------------------------------- diff --git a/tools/config-scripts/openstack/config.sh b/tools/config-scripts/openstack/config.sh index 76f04dc..e68029b 100755 --- a/tools/config-scripts/openstack/config.sh +++ b/tools/config-scripts/openstack/config.sh @@ -33,7 +33,7 @@ CP=`which cp` MV=`which mv` HOSTSFILE=/etc/hosts -LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.0/wso2carbon.lck +LOCKFILE=/mnt/apache-stratos-cartridge-agent-4.1.1-SNAPSHOT/wso2carbon.lck DATE=`date +%d%m%y%S` RANDOMNUMBER="`${TR} -c -d 0-9 < /dev/urandom | ${HEAD} -c 4`${DATE}" http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/base-image/Dockerfile ---------------------------------------------------------------------- diff --git a/tools/docker-images/cartridge-docker-images/base-image/Dockerfile b/tools/docker-images/cartridge-docker-images/base-image/Dockerfile index 686fd41..95debf9 100644 --- a/tools/docker-images/cartridge-docker-images/base-image/Dockerfile +++ b/tools/docker-images/cartridge-docker-images/base-image/Dockerfile @@ -48,13 +48,13 @@ RUN pip install yapsy # ------------------------- WORKDIR /mnt/ -ADD packs/apache-stratos-python-cartridge-agent-4.1.0.zip /mnt/apache-stratos-python-cartridge-agent-4.1.0.zip -RUN unzip -q /mnt/apache-stratos-python-cartridge-agent-4.1.0.zip -d /mnt/ -RUN rm /mnt/apache-stratos-python-cartridge-agent-4.1.0.zip +ADD packs/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip /mnt/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip +RUN unzip -q /mnt/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip -d /mnt/ +RUN rm /mnt/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip -RUN mkdir -p /mnt/apache-stratos-python-cartridge-agent-4.1.0/payload +RUN mkdir -p /mnt/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT/payload -RUN chmod +x /mnt/apache-stratos-python-cartridge-agent-4.1.0/extensions/bash/* +RUN chmod +x /mnt/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT/extensions/bash/* RUN mkdir -p /var/log/apache-stratos/ RUN touch /var/log/apache-stratos/cartridge-agent-extensions.log http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/base-image/files/run ---------------------------------------------------------------------- diff --git a/tools/docker-images/cartridge-docker-images/base-image/files/run b/tools/docker-images/cartridge-docker-images/base-image/files/run index ee71b11..f952864 100755 --- a/tools/docker-images/cartridge-docker-images/base-image/files/run +++ b/tools/docker-images/cartridge-docker-images/base-image/files/run @@ -26,7 +26,7 @@ source /root/.bashrc -export STRATOS_VERSION="4.1.0" +export STRATOS_VERSION="4.1.1-SNAPSHOT" export PCA_HOME="/mnt/apache-stratos-python-cartridge-agent-${STRATOS_VERSION}" set -o posix ; set | sed -e ':a;N;$!ba;s/\n/,/g' > ${PCA_HOME}/payload/launch-params http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/base-image/packs/.gitignore ---------------------------------------------------------------------- diff --git a/tools/docker-images/cartridge-docker-images/base-image/packs/.gitignore b/tools/docker-images/cartridge-docker-images/base-image/packs/.gitignore new file mode 100644 index 0000000..5e7d273 --- /dev/null +++ b/tools/docker-images/cartridge-docker-images/base-image/packs/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/build.sh ---------------------------------------------------------------------- diff --git a/tools/docker-images/cartridge-docker-images/build.sh b/tools/docker-images/cartridge-docker-images/build.sh index 3f32667..0f676c0 100755 --- a/tools/docker-images/cartridge-docker-images/build.sh +++ b/tools/docker-images/cartridge-docker-images/build.sh @@ -26,18 +26,18 @@ pca_distribution_path=`cd "$script_path/../../../products/python-cartridge-agent pushd ${pca_distribution_path} mvn clean install -Dmaven.test.skip=true -cp -vf target/apache-stratos-python-cartridge-agent-4.1.0.zip ${script_path}/base-image/packs/ +cp -vf target/apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip ${script_path}/base-image/packs/ popd pushd ${script_path}/base-image/ echo "Building base docker image..." -docker build -t stratos/base-image:4.1.0 . +sudo docker build -t stratos/base-image:4.1.1 . pushd ${script_path}/service-images/php echo "Building php docker image..." -docker build -t stratos/php:4.1.0 . +sudo docker build -t stratos/php:4.1.1 . pushd ${script_path}/service-images/tomcat echo "Building tomcat docker image..." -docker build -t stratos/tomcat:4.1.0 . +sudo docker build -t stratos/tomcat:4.1.1 . http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/service-images/php/Dockerfile ---------------------------------------------------------------------- diff --git a/tools/docker-images/cartridge-docker-images/service-images/php/Dockerfile b/tools/docker-images/cartridge-docker-images/service-images/php/Dockerfile index 9277e35..e5ad338 100644 --- a/tools/docker-images/cartridge-docker-images/service-images/php/Dockerfile +++ b/tools/docker-images/cartridge-docker-images/service-images/php/Dockerfile @@ -19,7 +19,7 @@ # # -------------------------------------------------------------- -FROM stratos/base-image:4.1.0 +FROM stratos/base-image:4.1.1 MAINTAINER [email protected] # ---------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile ---------------------------------------------------------------------- diff --git a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile index 48b6ff51..12ccb98 100644 --- a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile +++ b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/Dockerfile @@ -19,7 +19,7 @@ # # -------------------------------------------------------------- -FROM stratos/base-image:4.1.0 +FROM stratos/base-image:4.1.1 MAINTAINER [email protected] ENV JDK_VERSION 1.7.0_60 http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile ---------------------------------------------------------------------- diff --git a/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile b/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile index d3edddd..0bc4ecb 100644 --- a/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile +++ b/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile @@ -19,7 +19,7 @@ # # -------------------------------------------------------------- -FROM stratos/base-image:4.1.0 +FROM stratos/base-image:4.1.1 MAINTAINER [email protected] ENV JDK_VERSION 1.7.0_67 http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile ---------------------------------------------------------------------- diff --git a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile index be84fb5..9298ad2 100644 --- a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile +++ b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/Dockerfile @@ -19,7 +19,7 @@ # # -------------------------------------------------------------- -FROM stratos/base-image:4.1.0 +FROM stratos/base-image:4.1.1 MAINTAINER [email protected] ENV DEBIAN_FRONTEND noninteractive http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/docker-images/stratos-docker-images/run-example.sh ---------------------------------------------------------------------- diff --git a/tools/docker-images/stratos-docker-images/run-example.sh b/tools/docker-images/stratos-docker-images/run-example.sh index 94703f9..c41893d 100755 --- a/tools/docker-images/stratos-docker-images/run-example.sh +++ b/tools/docker-images/stratos-docker-images/run-example.sh @@ -31,7 +31,7 @@ export DOMAIN=example.com export IP_ADDR=192.168.56.5 # Set the version of Stratos docker images -export STRATOS_VERSION=4.1.0 +export STRATOS_VERSION=4.1.1-SNAPSHOT ######## # Bind http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/puppet3/modules/agent/files/README.txt ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/agent/files/README.txt b/tools/puppet3/modules/agent/files/README.txt index 04d5d6d..4bd05cd 100644 --- a/tools/puppet3/modules/agent/files/README.txt +++ b/tools/puppet3/modules/agent/files/README.txt @@ -7,6 +7,6 @@ This folder should have following: eg: if $mb_type = activemq, folder structure of this folder would be: >$ls ->activemq apache-stratos-python-cartridge-agent-4.1.0.zip +>activemq apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip 3. Under $mb_type folder, please add all the client jars, that should be copied to the agent's lib directory. http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/puppet3/modules/haproxy/files/README.txt ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/haproxy/files/README.txt b/tools/puppet3/modules/haproxy/files/README.txt index f3b4d69..189007a 100644 --- a/tools/puppet3/modules/haproxy/files/README.txt +++ b/tools/puppet3/modules/haproxy/files/README.txt @@ -7,6 +7,6 @@ This folder should have following: eg: if $mb_type = activemq, folder structure of this folder would be: >$ls ->activemq apache-stratos-haproxy-extension-4.1.0.zip +>activemq apache-stratos-haproxy-extension-4.1.1-SNAPSHOT.zip 3. Under $mb_type folder, please add all the client jars, that should be copied to the haproxy-extension's lib directory. http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/puppet3/modules/lb/files/README.txt ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/lb/files/README.txt b/tools/puppet3/modules/lb/files/README.txt index 04b99bf..8d1fe23 100644 --- a/tools/puppet3/modules/lb/files/README.txt +++ b/tools/puppet3/modules/lb/files/README.txt @@ -7,6 +7,6 @@ This folder should have following: eg: if $mb_type = activemq, folder structure of this folder would be: >$ls ->activemq apache-stratos-load-balancer-4.1.0.zip +>activemq apache-stratos-load-balancer-4.1.1-SNAPSHOT.zip 3. Under $mb_type folder, please add all the client jars, that should be copied to the load balancer's repository/components/lib directory. http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/puppet3/modules/python_agent/files/README.txt ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/python_agent/files/README.txt b/tools/puppet3/modules/python_agent/files/README.txt index 04d5d6d..4bd05cd 100644 --- a/tools/puppet3/modules/python_agent/files/README.txt +++ b/tools/puppet3/modules/python_agent/files/README.txt @@ -7,6 +7,6 @@ This folder should have following: eg: if $mb_type = activemq, folder structure of this folder would be: >$ls ->activemq apache-stratos-python-cartridge-agent-4.1.0.zip +>activemq apache-stratos-python-cartridge-agent-4.1.1-SNAPSHOT.zip 3. Under $mb_type folder, please add all the client jars, that should be copied to the agent's lib directory. http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/stratos-installer/README.md ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/README.md b/tools/stratos-installer/README.md index 4e67187..68ea3e4 100644 --- a/tools/stratos-installer/README.md +++ b/tools/stratos-installer/README.md @@ -1,7 +1,7 @@ -Apache Stratos 4.1.0 Installer +Apache Stratos 4.1.1 Installer ------------------------------ Stratos-Installer is a tool to install Stratos in Single JVM as well as in distributed setup. Please refer the following Stratos Wiki page for detailed installation guide: -https://cwiki.apache.org/confluence/display/STRATOS/4.1.0+Installation+Guide +https://cwiki.apache.org/confluence/display/STRATOS/4.1.1+Installation+Guide http://git-wip-us.apache.org/repos/asf/stratos/blob/d5680aa8/tools/stratos-installer/conf/setup.conf ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf index 6378091..045052f 100644 --- a/tools/stratos-installer/conf/setup.conf +++ b/tools/stratos-installer/conf/setup.conf @@ -55,7 +55,7 @@ export mb_ip="127.0.0.1" # Machine ip on which mb run export mb_port=61616 #default port which the message broker service runs export stratos_extract_path=$stratos_path/"apache-stratos" -export stratos_pack_zip_name="apache-stratos-4.1.0.zip" +export stratos_pack_zip_name="apache-stratos-4.1.1-SNAPSHOT.zip" export stratos_pack_zip=$stratos_packs/$stratos_pack_zip_name export activemq_pack=$stratos_packs/"apache-activemq-5.9.1-bin.tar.gz"
