You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/03/01 21:38:10 UTC
stratos git commit: Parameterizing jdk version and tomcat version in
tomcat-saml-sso dockerfile
Repository: stratos
Updated Branches:
refs/heads/master 04e315b1b -> 457be4b14
Parameterizing jdk version and tomcat version in tomcat-saml-sso dockerfile
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/457be4b1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/457be4b1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/457be4b1
Branch: refs/heads/master
Commit: 457be4b146d903ebfb9b055bb441b207a4026dfe
Parents: 04e315b
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Mar 2 02:07:59 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Mar 2 02:07:59 2015 +0530
----------------------------------------------------------------------
.../service-images/tomcat-saml-sso/Dockerfile | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/457be4b1/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 1096d45..17f8978 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
@@ -1,16 +1,20 @@
FROM chamilad/base-image:4.1.0-beta
MAINTAINER dev@stratos.apache.org
+ENV JDK_VERSION 1.7.0_60
+ENV JDK_TAR_FILENAME jdk-7u60-linux-x64.tar.gz
+ENV TOMCAT_VERSION 7.0.55
+
# ----------------------
# Install prerequisites
# ----------------------
# RUN apt-get update && \ apt-get install -yq --no-install-recommends openjdk-7-jre wget ca-certificates && \apt-get clean && \rm -rf /var/lib/apt/lists/*
WORKDIR /opt
-# RUN wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/7u67-b01/jdk-7u67-linux-x64.tar.gz
-ADD packs/jdk-7u67-linux-x64.tar.gz /mnt/jdk-7u67-linux-x64.tar.gz
-# RUN tar zxvf /mnt/jdk-7u67-linux-x64.tar.gz
-RUN mv /mnt/jdk-7u67-linux-x64.tar.gz/jdk1.7.0_67 /opt/jdk1.7.0_67
-ENV JAVA_HOME /opt/jdk1.7.0_67
+# RUN wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/7u67-b01/jdk-7u60-linux-x64.tar.gz
+ADD packs/${JDK_TAR_FILENAME} /mnt/${JDK_TAR_FILENAME}
+# RUN tar zxvf /mnt/${JDK_TAR_FILENAME}
+RUN mv /mnt/${JDK_TAR_FILENAME}/jdk${JDK_VERSION} /opt/jdk${JDK_VERSION}
+ENV JAVA_HOME /opt/jdk${JDK_VERSION}
ENV CATALINA_HOME /opt/tomcat
@@ -18,8 +22,8 @@ ENV CATALINA_HOME /opt/tomcat
# ----------------------
# Install Tomcat
# ----------------------
-ADD packs/apache-tomcat-7.0.59.tar.gz /opt/apache-tomcat-7.0.59.tar.gz
-RUN mv /opt/apache-tomcat-7.0.59.tar.gz/apache-tomcat-7.0.59 /opt/tomcat
+ADD packs/apache-tomcat-${TOMCAT_VERSION}.tar.gz /opt/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+RUN mv /opt/apache-tomcat-${TOMCAT_VERSION}.tar.gz/apache-tomcat-${TOMCAT_VERSION} /opt/tomcat
# -----------------------
# Add shell scripts