Repository: stratos Updated Branches: refs/heads/master 89fab3122 -> 78680bc5c
initial changes to minimise docker images Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e4f4414c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e4f4414c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e4f4414c Branch: refs/heads/master Commit: e4f4414c18ddf746e2d705f5bf87632efbbe9992 Parents: 5c43c10 Author: Chris Snow <[email protected]> Authored: Sun Aug 31 10:29:17 2014 +0000 Committer: Chris Snow <[email protected]> Committed: Sun Aug 31 10:29:17 2014 +0000 ---------------------------------------------------------------------- .../puppetmaster/Dockerfile | 6 +--- tools/stratos-docker-images/stratos/Dockerfile | 26 ++++++---------- .../stratos/docker-build.sh | 31 +++++++++++++++++++- 3 files changed, 40 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e4f4414c/tools/stratos-docker-images/puppetmaster/Dockerfile ---------------------------------------------------------------------- diff --git a/tools/stratos-docker-images/puppetmaster/Dockerfile b/tools/stratos-docker-images/puppetmaster/Dockerfile index 2fbd4d5..7289e76 100755 --- a/tools/stratos-docker-images/puppetmaster/Dockerfile +++ b/tools/stratos-docker-images/puppetmaster/Dockerfile @@ -38,11 +38,7 @@ COPY files/modules /etc/puppet/modules ADD files/jdk-7u51-linux-x64.tar.gz /etc/puppet/modules/java/files/ ADD files/apache-tomcat-7.0.52.tar.gz /etc/puppet/modules/tomcat/files/ - -ADD files/agentfiles.tgz /tmp/ - -RUN mv /tmp/apache-stratos-cartridge-agent-*.zip /etc/puppet/modules/agent/files/ -RUN mv /tmp/apache-stratos-load-balancer-*.zip /etc/puppet/modules/agent/files/ +ADD files/agentfiles.tgz /etc/puppet/modules/agent/files/ ADD run /usr/local/bin/run RUN chmod +x /usr/local/bin/run http://git-wip-us.apache.org/repos/asf/stratos/blob/e4f4414c/tools/stratos-docker-images/stratos/Dockerfile ---------------------------------------------------------------------- diff --git a/tools/stratos-docker-images/stratos/Dockerfile b/tools/stratos-docker-images/stratos/Dockerfile index 9ebb9c2..73990f0 100755 --- a/tools/stratos-docker-images/stratos/Dockerfile +++ b/tools/stratos-docker-images/stratos/Dockerfile @@ -19,22 +19,20 @@ # # ---------------------------------------------------------------------------- -FROM ubuntu:14.04 +FROM ubuntu:14.04 + +RUN apt-get update && \ + apt-get upgrade tzdata -y && \ + apt-get install openjdk-7-jre-headless -y && \ + apt-get clean && \ + rm -rf /var/cache/apt/* -RUN apt-get update -RUN apt-get upgrade tzdata -y -RUN apt-get install openjdk-7-jre-headless unzip wget -y ################# # Unpack Stratos ################# -WORKDIR /opt/ - -ADD /files/apache-stratos.zip /opt/apache-stratos.zip -RUN unzip -q apache-stratos.zip -RUN rm apache-stratos.zip -RUN mv apache-stratos-* apache-stratos +ADD /files/apache-stratos /opt/apache-stratos/ ADD /files/stratos-installer/config/all/repository/conf/activemq/jndi.properties /opt/apache-stratos/repository/conf/ @@ -42,13 +40,7 @@ ADD /files/stratos-installer/config/all/repository/conf/activemq/jndi.properties # Get ActiveMQ libs #################### -ADD /files/apache-activemq-5.9.1-bin.tar.gz /opt/ - -RUN cp -f apache-activemq-5.9.1/lib/activemq-broker-5.9.1.jar /opt/apache-stratos/repository/components/lib/ -RUN cp -f apache-activemq-5.9.1/lib/activemq-client-5.9.1.jar /opt/apache-stratos/repository/components/lib/ -RUN cp -f apache-activemq-5.9.1/lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar /opt/apache-stratos/repository/components/lib/ -RUN cp -f apache-activemq-5.9.1/lib/geronimo-jms_1.1_spec-1.1.1.jar /opt/apache-stratos/repository/components/lib/ -RUN rm -rf apache-activemq-5.9.1 +#ADD /files/apache-activemq-lib /opt/apache-stratos/repository/components/lib/ ########### # CC Setup http://git-wip-us.apache.org/repos/asf/stratos/blob/e4f4414c/tools/stratos-docker-images/stratos/docker-build.sh ---------------------------------------------------------------------- diff --git a/tools/stratos-docker-images/stratos/docker-build.sh b/tools/stratos-docker-images/stratos/docker-build.sh index cc6a248..99109f0 100755 --- a/tools/stratos-docker-images/stratos/docker-build.sh +++ b/tools/stratos-docker-images/stratos/docker-build.sh @@ -22,14 +22,43 @@ set -e -cp -f $STRATOS_SOURCE/products/stratos/modules/distribution/target/apache-stratos-*.zip files/apache-stratos.zip +# +# Stratos files to be copied to the image +# + +rm -rf files/apache-stratos files/apache-stratos-* +unzip $STRATOS_SOURCE/products/stratos/modules/distribution/target/apache-stratos-*.zip -d files/ +mv files/apache-stratos-* files/apache-stratos + +# +# ActiveMQ files to be copied to the image +# wget -N -q -P files/ http://archive.apache.org/dist/activemq/5.9.1/apache-activemq-5.9.1-bin.tar.gz +rm -rf files/apache-activemq-lib files/apache-activemq-lib-tmp +mkdir files/apache-activemq-lib files/apache-activemq-lib-tmp +tar -xzf files/apache-activemq-5.9.1-bin.tar.gz -C files/apache-activemq-lib-tmp +cp files/apache-activemq-lib-tmp/apache-activemq-5.9.1/lib/activemq-broker-5.9.1.jar files/apache-activemq-lib +cp files/apache-activemq-lib-tmp/apache-activemq-5.9.1/lib/activemq-client-5.9.1.jar files/apache-activemq-lib +cp files/apache-activemq-lib-tmp/apache-activemq-5.9.1/lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar files/apache-activemq-lib +cp files/apache-activemq-lib-tmp/apache-activemq-5.9.1/lib/geronimo-jms_1.1_spec-1.1.1.jar files/apache-activemq-lib + +# +# MySQL jar to be copied to the image +# wget -N -q -P files/ http://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.29/mysql-connector-java-5.1.29.jar +# +# Stratos installer files to copy to the image +# + cp -rf $STRATOS_SOURCE/tools/stratos-installer files/ +# +# Extensions files to copy to the image +# + cp -rf $STRATOS_SOURCE/extensions/ files/ docker build -t=apachestratos/stratos:$VERSION .
