Version 1.1.0-ea-cloudsoft.20160113

Author: grkvlt

README.md

@@ -15,7 +15,7 @@ This repository contains all of the required Brooklyn entities, locations and ex
 [![Latest Builds](http://img.shields.io/badge/version-1.1.0--SNAPSHOT-blue.svg?style=flat)](http://clocker-latest.s3-website-eu-west-1.amazonaws.com/) 
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/brooklyncentral/clocker)
 <!-- CLOCKER_VERSION_BELOW -->
-[![Docker Image](https://badge.imagelayers.io/clockercentral/clocker:1.1.0-PREVIEW.20160112.svg)](https://imagelayers.io/?images=clockercentral/clocker:1.1.0-PREVIEW.20160112)
+[![Docker Image](https://badge.imagelayers.io/clockercentral/clocker:1.1.0-ea-cloudsoft.20160113.svg)](https://imagelayers.io/?images=clockercentral/clocker:1.1.0-ea-cloudsoft.20160113)
 
 ## Getting started
 
@@ -37,7 +37,7 @@ depending on your choice of SDN provider.
 ### Using the latest Clocker release
 
 <!-- CLOCKER_VERSION_BELOW -->
-The latest version of Clocker is [1.1.0-PREVIEW.20160112](https://github.com/brooklyncentral/clocker/releases/tag/v1.1.0-PREVIEW.20160112).
+The latest version of Clocker is [1.1.0-ea-cloudsoft.20160113](https://github.com/brooklyncentral/clocker/releases/tag/v1.1.0-ea-cloudsoft.20160113).
 You can deploy your own **Docker Cloud** with a Weave SDN by running these commands with the _network_ argument
 set to `weave`, to use Project Calico as your SDN provider, change the last argument to `calico` instead:
 ```Bash

clocker.bom

@@ -13,13 +13,13 @@
 # limitations under the License.
 
 brooklyn.catalog:
-  version: "1.1.0-PREVIEW.20160112" # CLOCKER_VERSION
+  version: "1.1.0-ea-cloudsoft.20160113" # CLOCKER_VERSION
 
   brooklyn.libraries:
 
-  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0-PREVIEW.20160112/brooklyn-clocker-patches-1.1.0-PREVIEW.20160112.jar" # CLOCKER_VERSION
-  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0-PREVIEW.20160112/brooklyn-clocker-docker-1.1.0-PREVIEW.20160112.jar" # CLOCKER_VERSION
-  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-PREVIEW.20160112/brooklyn-clocker-dist-1.1.0-PREVIEW.20160112.jar" # CLOCKER_VERSION
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0-ea-cloudsoft.20160113/brooklyn-clocker-patches-1.1.0-ea-cloudsoft.20160113.jar" # CLOCKER_VERSION
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0-ea-cloudsoft.20160113/brooklyn-clocker-docker-1.1.0-ea-cloudsoft.20160113.jar" # CLOCKER_VERSION
+  - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-ea-cloudsoft.20160113/brooklyn-clocker-dist-1.1.0-ea-cloudsoft.20160113.jar" # CLOCKER_VERSION
   - "https://s3-eu-west-1.amazonaws.com/brooklyn-clocker/patch-softlayer-clocker-137.jar"
   - "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-portforwarding/0.8.0-incubating/brooklyn-networking-portforwarding-0.8.0-incubating.jar" # ADVANCED_NETWORKING_VERSION
   - "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-common/0.8.0-incubating/brooklyn-networking-common-0.8.0-incubating.jar" # ADVANCED_NETWORKING_VERSION

console/pom.xml

@@ -31,7 +31,7 @@
     <parent>
         <groupId>io.brooklyn.clocker</groupId>
         <artifactId>brooklyn-clocker-parent</artifactId>
-        <version>1.1.0-PREVIEW.20160112</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.0-ea-cloudsoft.20160113</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

dist/Dockerfile

@@ -16,7 +16,7 @@ FROM gliderlabs/alpine:3.1
 MAINTAINER andrew.kennedy@cloudsoft.io
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-PREVIEW.20160112"
+LABEL version="1.1.0-ea-cloudsoft.20160113"
 
 RUN apk-install openjdk7-jre-base ; \
     apk-install openjdk7-jre-lib ; \
@@ -29,7 +29,7 @@ RUN bash /tmp/certgen.sh /usr/lib/jvm/java-1.7-openjdk/jre/lib/security/cacerts
     rm -f /tmp/certgen.sh
 
 # CLOCKER_VERSION_BELOW
-RUN wget --no-check-certificate http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-PREVIEW.20160112/brooklyn-clocker-dist-1.1.0-PREVIEW.20160112-dist.tar.gz -O /brooklyn-clocker-dist.tar.gz ; \
+RUN wget --no-check-certificate http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-ea-cloudsoft.20160113/brooklyn-clocker-dist-1.1.0-ea-cloudsoft.20160113-dist.tar.gz -O /brooklyn-clocker-dist.tar.gz ; \
     tar zxf brooklyn-clocker-dist.tar.gz ; \
     rm -f brooklyn-clocker-dist.tar.gz
 

dist/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>brooklyn-clocker-parent</artifactId>
         <groupId>io.brooklyn.clocker</groupId>
-        <version>1.1.0-PREVIEW.20160112</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.0-ea-cloudsoft.20160113</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

dist/src/main/assembly/conf/brooklyn/default.catalog.bom

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 brooklyn.catalog:
-  version: 1.1.0-PREVIEW.20160112 # CLOCKER_VERSION
+  version: 1.1.0-ea-cloudsoft.20160113 # CLOCKER_VERSION
   items:
 
   # load everything in the classpath with a @Catalog annotation

docker/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>brooklyn-clocker-parent</artifactId>
         <groupId>io.brooklyn.clocker</groupId>
-        <version>1.1.0-PREVIEW.20160112</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.0-ea-cloudsoft.20160113</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

docker/src/main/resources/brooklyn/entity/container/docker/SshdDockerfile

@@ -18,7 +18,7 @@ FROM ${fullyQualifiedImageName}
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-PREVIEW.20160112"
+LABEL version="1.1.0-ea-cloudsoft.20160113"
 
 # setup locale
 RUN type locale-gen ; if [ "$?" -eq "0" ] ; then locale-gen en_US.UTF-8 ; fi

docker/src/main/resources/brooklyn/entity/container/docker/centos/Dockerfile

@@ -18,4 +18,4 @@ FROM centos:6.6
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-PREVIEW.20160112"
+LABEL version="1.1.0-ea-cloudsoft.20160113"

docker/src/main/resources/brooklyn/entity/container/docker/coreos/Dockerfile

@@ -18,7 +18,7 @@ FROM ubuntu:12.04
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-PREVIEW.20160112"
+LABEL version="1.1.0-ea-cloudsoft.20160113"
 
 # make sure the package repository is up to date
 RUN ( echo "deb http://archive.ubuntu.com/ubuntu precise main universe" ; echo "deb http://archive.ubuntu.com/ubuntu precise-updates main universe" ) > /etc/apt/sources.list

docker/src/main/resources/brooklyn/entity/container/docker/ubuntu/Dockerfile

@@ -18,7 +18,7 @@ FROM ubuntu:14.04
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-PREVIEW.20160112"
+LABEL version="1.1.0-ea-cloudsoft.20160113"
 
 # Make sure the package repository is up to date
 RUN ( echo "deb http://archive.ubuntu.com/ubuntu trusty main universe" ; echo "deb http://archive.ubuntu.com/ubuntu trusty-updates main universe" ) > /etc/apt/sources.list

docker/src/main/resources/brooklyn/entity/container/docker/ubuntu/NetworkingDockerfile

@@ -18,7 +18,7 @@ FROM ubuntu:14.04
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-PREVIEW.20160112"
+LABEL version="1.1.0-ea-cloudsoft.20160113"
 
 # make sure the package repository is up to date
 RUN ( echo "deb http://archive.ubuntu.com/ubuntu trusty main universe" ; echo "deb http://archive.ubuntu.com/ubuntu trusty-updates main universe" ) > /etc/apt/sources.list

docker/src/main/resources/brooklyn/entity/container/docker/ubuntu/UsesJavaDockerfile

@@ -18,7 +18,7 @@ FROM ubuntu:14.04
 MAINTAINER Cloudsoft "brooklyn@cloudsoftcorp.com"
 
 # CLOCKER_VERSION_BELOW
-LABEL version="1.1.0-PREVIEW.20160112"
+LABEL version="1.1.0-ea-cloudsoft.20160113"
 
 # make sure the package repository is up to date
 RUN ( echo "deb http://archive.ubuntu.com/ubuntu trusty main universe" ; echo "deb http://archive.ubuntu.com/ubuntu trusty-updates main universe" ) > /etc/apt/sources.list

jsgui/src/main/webapp/assets/tpl/help/page.html

@@ -32,7 +32,7 @@ <h3>Clocker Help</h3>
     using Docker and Marathon in the Cloud.
     </p>
     <p>
-    You are currently using Clocker Version 1.1.0-PREVIEW.20160112 <!-- CLOCKER_VERSION -->
+    You are currently using Clocker Version 1.1.0-ea-cloudsoft.20160113 <!-- CLOCKER_VERSION -->
     </p>
     <hr/>
     <h3>References</h3>

jsgui/src/main/webapp/index.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- github GIT_SHA_1 -->
-<!-- clocker 1.1.0-PREVIEW.20160112 --> <!-- CLOCKER_VERSION -->
+<!-- clocker 1.1.0-ea-cloudsoft.20160113 --> <!-- CLOCKER_VERSION -->
 <!-- brooklyn 0.9.0-ea-cloudsoft.20160113 --> <!-- BROOKLYN_VERSION -->
 <!-- advanced-networking 0.9.0-ea-cloudsoft.20160113 --> <!-- ADVANCED_NETWORKING_VERSION -->
 <!-- jclouds 1.9.2-ea-cloudsoft.20160113 --> <!-- JCLOUDS_VERSION -->

patches/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>brooklyn-clocker-parent</artifactId>
         <groupId>io.brooklyn.clocker</groupId>
-        <version>1.1.0-PREVIEW.20160112</version>  <!-- CLOCKER_VERSION -->
+        <version>1.1.0-ea-cloudsoft.20160113</version>  <!-- CLOCKER_VERSION -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

pom.xml

@@ -35,7 +35,7 @@
 
     <groupId>io.brooklyn.clocker</groupId>
     <artifactId>brooklyn-clocker-parent</artifactId>
-    <version>1.1.0-PREVIEW.20160112</version>  <!-- CLOCKER_VERSION -->
+    <version>1.1.0-ea-cloudsoft.20160113</version>  <!-- CLOCKER_VERSION -->
     <packaging>pom</packaging>
     <name>Clocker Project (Parent)</name>
     <description>