You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/08/12 13:32:55 UTC
[32/50] [abbrv] stratos git commit: Uplift JDK and Tomcat versions in
Puppet and Dockerfiles
Uplift JDK and Tomcat versions in Puppet and Dockerfiles
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ad3066ab
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ad3066ab
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ad3066ab
Branch: refs/heads/data-publisher-integration
Commit: ad3066abe59e23696846e9ea464516b42b27b6a2
Parents: bd65af0
Author: Akila Perera <ra...@gmail.com>
Authored: Sat Aug 8 00:11:33 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Sat Aug 8 00:11:33 2015 +0530
----------------------------------------------------------------------
tools/docker-images/cartridge-docker-images/build.sh | 7 +++----
.../service-images/tomcat-saml-sso/Dockerfile | 4 ++--
.../cartridge-docker-images/service-images/tomcat/Dockerfile | 6 +++---
.../service-images/wso2is-saml-sso/Dockerfile | 4 ++--
.../stratos-docker-images/puppetmaster/docker-build.sh | 4 ++--
tools/docker-images/stratos-docker-images/puppetmaster/run | 4 ++--
tools/puppet3/manifests/nodes/base.pp | 4 ++--
7 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ad3066ab/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 6ceab94..8a8c30a 100755
--- a/tools/docker-images/cartridge-docker-images/build.sh
+++ b/tools/docker-images/cartridge-docker-images/build.sh
@@ -30,14 +30,13 @@ cp -vf target/apache-stratos-python-cartridge-agent-4.1.1.zip ${script_path}/bas
popd
pushd ${script_path}/base-image/
-echo "Building base docker image..."
+echo "Building base Docker image..."
sudo docker build -t stratos/base-image:4.1.1 .
pushd ${script_path}/service-images/php
-echo "Building php docker image..."
+echo "Building PHP Docker image..."
sudo docker build -t stratos/php:4.1.1 .
pushd ${script_path}/service-images/tomcat
-echo "Building tomcat docker image..."
+echo "Building Tomcat Docker image..."
sudo docker build -t stratos/tomcat:4.1.1 .
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/ad3066ab/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 12ccb98..3a8d46b 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
@@ -22,8 +22,8 @@
FROM stratos/base-image:4.1.1
MAINTAINER dev@stratos.apache.org
-ENV JDK_VERSION 1.7.0_60
-ENV JDK_TAR_FILENAME jdk-7u60-linux-x64.tar.gz
+ENV JDK_VERSION 1.7.0_80
+ENV JDK_TAR_FILENAME jdk-7u80-linux-x64.tar.gz
ENV TOMCAT_VERSION 7.0.55
# ----------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ad3066ab/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 0bc4ecb..fec1792 100644
--- a/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile
+++ b/tools/docker-images/cartridge-docker-images/service-images/tomcat/Dockerfile
@@ -22,9 +22,9 @@
FROM stratos/base-image:4.1.1
MAINTAINER dev@stratos.apache.org
-ENV JDK_VERSION 1.7.0_67
-ENV JDK_TAR_FILENAME jdk-7u67-linux-x64.tar.gz
-ENV TOMCAT_VERSION 7.0.59
+ENV JDK_VERSION 1.7.0_80
+ENV JDK_TAR_FILENAME jdk-7u80-linux-x64.tar.gz
+ENV TOMCAT_VERSION 7.0.63
# ----------------------
# Install prerequisites
http://git-wip-us.apache.org/repos/asf/stratos/blob/ad3066ab/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 9298ad2..5b895f0 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
@@ -23,8 +23,8 @@ FROM stratos/base-image:4.1.1
MAINTAINER dev@stratos.apache.org
ENV DEBIAN_FRONTEND noninteractive
-ENV JDK_VERSION 1.7.0_60
-ENV JDK_TAR_FILENAME jdk-7u60-linux-x64.tar.gz
+ENV JDK_VERSION 1.7.0_80
+ENV JDK_TAR_FILENAME jdk-7u80-linux-x64.tar.gz
ENV WSO2_IS_VERSION 5.0.0
# ----------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ad3066ab/tools/docker-images/stratos-docker-images/puppetmaster/docker-build.sh
----------------------------------------------------------------------
diff --git a/tools/docker-images/stratos-docker-images/puppetmaster/docker-build.sh b/tools/docker-images/stratos-docker-images/puppetmaster/docker-build.sh
index 86280a7..4336334 100755
--- a/tools/docker-images/stratos-docker-images/puppetmaster/docker-build.sh
+++ b/tools/docker-images/stratos-docker-images/puppetmaster/docker-build.sh
@@ -37,7 +37,7 @@ TOMCAT_URL="http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.52/bin/apache-to
HAWTBUF_URL="http://repo1.maven.org/maven2/org/fusesource/hawtbuf/hawtbuf/1.9/hawtbuf-1.9.jar"
# if you change the JDK version, you will need to change the version in the Dockerfile too
-JDK_URL="http://download.oracle.com/otn-pub/java/jdk/7u51-b13/jdk-7u51-linux-x64.tar.gz"
+JDK_URL="http://download.oracle.com/otn-pub/java/jdk/7u51-b13/jdk-7u80-linux-x64.tar.gz"
#
# Tomcat to be copied to the image
@@ -87,7 +87,7 @@ cp -f $STRATOS_SOURCE/products/load-balancer/modules/distribution/target/apache-
cd files/
tar -cvzf apache-activemq-libs.tgz -C apache-activemq-lib/ .
-tar -cvzf jdk.tgz jdk-7u51-linux-x64.tar.gz
+tar -cvzf jdk.tgz jdk-7u80-linux-x64.tar.gz
tar -cvzf apache-tomcat.tgz apache-tomcat-7.0.52.tar.gz
tar -cvzf apache-stratos-cartridge-agent.tgz apache-stratos-cartridge-agent-*.zip
tar -cvzf apache-stratos-load-balancer.tgz apache-stratos-load-balancer-*.zip
http://git-wip-us.apache.org/repos/asf/stratos/blob/ad3066ab/tools/docker-images/stratos-docker-images/puppetmaster/run
----------------------------------------------------------------------
diff --git a/tools/docker-images/stratos-docker-images/puppetmaster/run b/tools/docker-images/stratos-docker-images/puppetmaster/run
index 80a4840..c3d7f94 100755
--- a/tools/docker-images/stratos-docker-images/puppetmaster/run
+++ b/tools/docker-images/stratos-docker-images/puppetmaster/run
@@ -47,8 +47,8 @@ sed -i "3i dns_alt_names=${MASTERHOSTNAME}" /etc/puppet/puppet.conf
PUPPET_FILE=/etc/puppet/manifests/nodes/base.pp
# TODO java version is hard coded
-sed -i -E "s:(\s*[$]java_name.*=).*$:\1 \"jdk1.7.0_51\":g" $PUPPET_FILE
-sed -i -E "s:(\s*[$]java_distribution.*=).*$:\1 \"jdk-7u51-linux-x64.tar.gz\":g" $PUPPET_FILE
+sed -i -E "s:(\s*[$]java_name.*=).*$:\1 \"jdk1.7.0_80\":g" $PUPPET_FILE
+sed -i -E "s:(\s*[$]java_distribution.*=).*$:\1 \"jdk-7u80-linux-x64.tar.gz\":g" $PUPPET_FILE
sed -i -E "s:(\s*[$]local_package_dir.*=).*$:\1 \"/mnt/packs\":g" $PUPPET_FILE
sed -i -E "s:(\s*[$]mb_ip.*=).*$:\1 \"$MB_HOSTNAME\":g" $PUPPET_FILE
http://git-wip-us.apache.org/repos/asf/stratos/blob/ad3066ab/tools/puppet3/manifests/nodes/base.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/manifests/nodes/base.pp b/tools/puppet3/manifests/nodes/base.pp
index a92942a..412aa31 100755
--- a/tools/puppet3/manifests/nodes/base.pp
+++ b/tools/puppet3/manifests/nodes/base.pp
@@ -28,8 +28,8 @@ node 'base' {
$cep_username ='admin'
$cep_password ='admin'
$truststore_password = 'wso2carbon'
- $java_distribution = 'jdk-7u51-linux-x64.tar.gz'
- $java_name = 'jdk1.7.0_51'
+ $java_distribution = 'jdk-7u80-linux-x64.tar.gz'
+ $java_name = 'jdk1.7.0_80'
$member_type_ip = 'private'
$lb_httpPort = '80'
$lb_httpsPort = '443'