diff --git a/README.md b/README.md
index f251c9b2..cbe00c22 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Docker Cloud infrastructure.
This repository contains all of the required Brooklyn entities, locations and examples.
-[![Build Status](https://api.travis-ci.org/brooklyncentral/clocker.svg?branch=master)](https://travis-ci.org/brooklyncentral/clocker) [![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) [![Docker Image](https://badge.imagelayers.io/clockercentral/clocker:1.1.0-PREVIEW.20160229.svg)](https://imagelayers.io/?images=clockercentral/clocker:1.1.0-PREVIEW.20160229)
+[![Build Status](https://api.travis-ci.org/brooklyncentral/clocker.svg?branch=master)](https://travis-ci.org/brooklyncentral/clocker) [![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) [![Docker Image](https://badge.imagelayers.io/clockercentral/clocker:1.1.0-PREVIEW.20160324.svg)](https://imagelayers.io/?images=clockercentral/clocker:1.1.0-PREVIEW.20160324)
## Getting started
@@ -34,7 +34,7 @@ depending on your choice of SDN provider.
### Using the latest Clocker release
-The latest version of Clocker is [1.1.0-PREVIEW.20160229](https://github.com/brooklyncentral/clocker/releases/tag/v1.1.0-PREVIEW.20160229).
+The latest version of Clocker is [1.1.0-PREVIEW.20160324](https://github.com/brooklyncentral/clocker/releases/tag/v1.1.0-PREVIEW.20160324).
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
diff --git a/clocker.bom b/clocker.bom
index 6c94b26c..a01982c3 100644
--- a/clocker.bom
+++ b/clocker.bom
@@ -13,13 +13,13 @@
# limitations under the License.
brooklyn.catalog:
- version: "1.1.0-PREVIEW.20160229" # CLOCKER_VERSION
+ version: "1.1.0-PREVIEW.20160324" # CLOCKER_VERSION
brooklyn.libraries:
- - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0-PREVIEW.20160229/brooklyn-clocker-patches-1.1.0-PREVIEW.20160229.jar" # CLOCKER_VERSION
- - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0-PREVIEW.20160229/brooklyn-clocker-docker-1.1.0-PREVIEW.20160229.jar" # CLOCKER_VERSION
- - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-PREVIEW.20160229/brooklyn-clocker-dist-1.1.0-PREVIEW.20160229.jar" # CLOCKER_VERSION
+ - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0-PREVIEW.20160324/brooklyn-clocker-patches-1.1.0-PREVIEW.20160324.jar" # CLOCKER_VERSION
+ - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0-PREVIEW.20160324/brooklyn-clocker-docker-1.1.0-PREVIEW.20160324.jar" # CLOCKER_VERSION
+ - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-PREVIEW.20160324/brooklyn-clocker-dist-1.1.0-PREVIEW.20160324.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
diff --git a/console/pom.xml b/console/pom.xml
index f8e8b2ab..08ae56f8 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -31,7 +31,7 @@
io.brooklyn.clocker
brooklyn-clocker-parent
- 1.1.0-PREVIEW.20160229
+ 1.1.0-PREVIEW.20160324
../pom.xml
diff --git a/dist/Dockerfile b/dist/Dockerfile
index c3bf4e96..43dbf908 100644
--- a/dist/Dockerfile
+++ b/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.20160229"
+LABEL version="1.1.0-PREVIEW.20160324"
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.20160229/brooklyn-clocker-dist-1.1.0-PREVIEW.20160229-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-PREVIEW.20160324/brooklyn-clocker-dist-1.1.0-PREVIEW.20160324-dist.tar.gz -O /brooklyn-clocker-dist.tar.gz ; \
tar zxf brooklyn-clocker-dist.tar.gz ; \
rm -f brooklyn-clocker-dist.tar.gz
diff --git a/dist/pom.xml b/dist/pom.xml
index c2ae358a..d3aa7e2f 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -22,7 +22,7 @@
brooklyn-clocker-parent
io.brooklyn.clocker
- 1.1.0-PREVIEW.20160229
+ 1.1.0-PREVIEW.20160324
../pom.xml
diff --git a/dist/src/main/assembly/conf/brooklyn/default.catalog.bom b/dist/src/main/assembly/conf/brooklyn/default.catalog.bom
index d0f8a582..2539ecca 100644
--- a/dist/src/main/assembly/conf/brooklyn/default.catalog.bom
+++ b/dist/src/main/assembly/conf/brooklyn/default.catalog.bom
@@ -13,7 +13,7 @@
# limitations under the License.
brooklyn.catalog:
- version: 1.1.0-PREVIEW.20160229 # CLOCKER_VERSION
+ version: 1.1.0-PREVIEW.20160324 # CLOCKER_VERSION
items:
# load everything in the classpath with a @Catalog annotation
diff --git a/docker/pom.xml b/docker/pom.xml
index 51b8e162..4f761455 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -22,7 +22,7 @@
brooklyn-clocker-parent
io.brooklyn.clocker
- 1.1.0-PREVIEW.20160229
+ 1.1.0-PREVIEW.20160324
../pom.xml
diff --git a/docker/src/main/resources/brooklyn/entity/container/docker/SshdDockerfile b/docker/src/main/resources/brooklyn/entity/container/docker/SshdDockerfile
index 76c9527b..081b3c20 100644
--- a/docker/src/main/resources/brooklyn/entity/container/docker/SshdDockerfile
+++ b/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.20160229"
+LABEL version="1.1.0-PREVIEW.20160324"
# setup locale
RUN type locale-gen ; if [ "$?" -eq "0" ] ; then locale-gen en_US.UTF-8 ; fi
diff --git a/docker/src/main/resources/brooklyn/entity/container/docker/centos/Dockerfile b/docker/src/main/resources/brooklyn/entity/container/docker/centos/Dockerfile
index bb5b4770..74348160 100644
--- a/docker/src/main/resources/brooklyn/entity/container/docker/centos/Dockerfile
+++ b/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.20160229"
+LABEL version="1.1.0-PREVIEW.20160324"
diff --git a/docker/src/main/resources/brooklyn/entity/container/docker/coreos/Dockerfile b/docker/src/main/resources/brooklyn/entity/container/docker/coreos/Dockerfile
index ad741691..638d19fe 100644
--- a/docker/src/main/resources/brooklyn/entity/container/docker/coreos/Dockerfile
+++ b/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.20160229"
+LABEL version="1.1.0-PREVIEW.20160324"
# 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
diff --git a/docker/src/main/resources/brooklyn/entity/container/docker/ubuntu/Dockerfile b/docker/src/main/resources/brooklyn/entity/container/docker/ubuntu/Dockerfile
index 7ae50751..0d7da4b0 100644
--- a/docker/src/main/resources/brooklyn/entity/container/docker/ubuntu/Dockerfile
+++ b/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.20160229"
+LABEL version="1.1.0-PREVIEW.20160324"
# 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
diff --git a/docker/src/main/resources/brooklyn/entity/container/docker/ubuntu/NetworkingDockerfile b/docker/src/main/resources/brooklyn/entity/container/docker/ubuntu/NetworkingDockerfile
index 8898ae71..9397e4e0 100644
--- a/docker/src/main/resources/brooklyn/entity/container/docker/ubuntu/NetworkingDockerfile
+++ b/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.20160229"
+LABEL version="1.1.0-PREVIEW.20160324"
# 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
diff --git a/docker/src/main/resources/brooklyn/entity/container/docker/ubuntu/UsesJavaDockerfile b/docker/src/main/resources/brooklyn/entity/container/docker/ubuntu/UsesJavaDockerfile
index 85bfc10f..d8859cd9 100644
--- a/docker/src/main/resources/brooklyn/entity/container/docker/ubuntu/UsesJavaDockerfile
+++ b/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.20160229"
+LABEL version="1.1.0-PREVIEW.20160324"
# 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
diff --git a/jsgui/pom.xml b/jsgui/pom.xml
index 91183bab..24b4b3e2 100644
--- a/jsgui/pom.xml
+++ b/jsgui/pom.xml
@@ -15,7 +15,7 @@
io.brooklyn.clocker
brooklyn-clocker-parent
- 1.1.0-PREVIEW.20160229
+ 1.1.0-PREVIEW.20160324
../pom.xml
diff --git a/jsgui/src/main/webapp/assets/tpl/help/page.html b/jsgui/src/main/webapp/assets/tpl/help/page.html
index d1f3b7c8..32d6bee9 100644
--- a/jsgui/src/main/webapp/assets/tpl/help/page.html
+++ b/jsgui/src/main/webapp/assets/tpl/help/page.html
@@ -32,7 +32,7 @@
Clocker Help
using Docker and Marathon in the Cloud.
- You are currently using Clocker Version 1.1.0-PREVIEW.20160229
+ You are currently using Clocker Version 1.1.0-PREVIEW.20160324
References
diff --git a/jsgui/src/main/webapp/index.html b/jsgui/src/main/webapp/index.html
index e79c329d..bfc77d81 100644
--- a/jsgui/src/main/webapp/index.html
+++ b/jsgui/src/main/webapp/index.html
@@ -1,13 +1,13 @@
-
+
- Clocker 1.1.0-PREVIEW.20160229
+ Clocker 1.1.0-PREVIEW.20160324
diff --git a/mesos/pom.xml b/mesos/pom.xml
index 75bbf3c3..92d612fa 100644
--- a/mesos/pom.xml
+++ b/mesos/pom.xml
@@ -22,7 +22,7 @@
brooklyn-clocker-parent
io.brooklyn.clocker
- 1.1.0-SNAPSHOT
+ 1.1.0-PREVIEW.20160324
../pom.xml
diff --git a/patches/pom.xml b/patches/pom.xml
index 42bd24b4..c20ebafb 100644
--- a/patches/pom.xml
+++ b/patches/pom.xml
@@ -22,7 +22,7 @@
brooklyn-clocker-parent
io.brooklyn.clocker
- 1.1.0-PREVIEW.20160229
+ 1.1.0-PREVIEW.20160324
../pom.xml
diff --git a/pom.xml b/pom.xml
index bd7a20b2..0fbb0208 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
io.brooklyn.clocker
brooklyn-clocker-parent
- 1.1.0-PREVIEW.20160229
+ 1.1.0-PREVIEW.20160324
pom
Clocker Project (Parent)