diff --git a/README.md b/README.md index c244ba61..499136c6 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ depending on your choice of SDN provider. ### Using the latest Clocker release -The latest version of Clocker is [1.1.0-PREVIEW.20151113](https://github.com/brooklyncentral/clocker/releases/tag/v1.1.0-PREVIEW.20151113). +The latest version of Clocker is [1.1.0-PREVIEW.20151205](https://github.com/brooklyncentral/clocker/releases/tag/v1.1.0-PREVIEW.20151205). You can deploy your own **Docker Cloud** with a Weave SDN by running these commands with the _network_ argument st 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 4d58f8e1..17d46711 100644 --- a/clocker.bom +++ b/clocker.bom @@ -13,13 +13,13 @@ # limitations under the License. brooklyn.catalog: - version: "1.1.0-PREVIEW.20151113" # CLOCKER_VERSION + version: "1.1.0-PREVIEW.20151205" # CLOCKER_VERSION brooklyn.libraries: - - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0-PREVIEW.20151113/brooklyn-clocker-patches-1.1.0-PREVIEW.20151113.jar" # CLOCKER_VERSION - - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0-PREVIEW.20151113/brooklyn-clocker-docker-1.1.0-PREVIEW.20151113.jar" # CLOCKER_VERSION - - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-PREVIEW.20151113/brooklyn-clocker-dist-1.1.0-PREVIEW.20151113.jar" # CLOCKER_VERSION + - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0-PREVIEW.20151205/brooklyn-clocker-patches-1.1.0-PREVIEW.20151205.jar" # CLOCKER_VERSION + - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0-PREVIEW.20151205/brooklyn-clocker-docker-1.1.0-PREVIEW.20151205.jar" # CLOCKER_VERSION + - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-PREVIEW.20151205/brooklyn-clocker-dist-1.1.0-PREVIEW.20151205.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 a969fab6..6f2feb20 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -31,7 +31,7 @@ io.brooklyn.clocker brooklyn-clocker-parent - 1.1.0-PREVIEW.20151113 + 1.1.0-PREVIEW.20151205 ../pom.xml diff --git a/dist/Dockerfile b/dist/Dockerfile index 56d64124..44d5bfbd 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.20151113" +LABEL version="1.1.0-PREVIEW.20151205" 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.20151113/brooklyn-clocker-dist-1.1.0-PREVIEW.20151113-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.20151205/brooklyn-clocker-dist-1.1.0-PREVIEW.20151205-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 27f95753..59314623 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ brooklyn-clocker-parent io.brooklyn.clocker - 1.1.0-PREVIEW.20151113 + 1.1.0-PREVIEW.20151205 ../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 73154b05..75ca72db 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.20151113 # CLOCKER_VERSION + version: 1.1.0-PREVIEW.20151205 # CLOCKER_VERSION items: # load everything in the classpath with a @Catalog annotation diff --git a/docker/pom.xml b/docker/pom.xml index b9bc0530..b9e66c21 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -22,7 +22,7 @@ brooklyn-clocker-parent io.brooklyn.clocker - 1.1.0-PREVIEW.20151113 + 1.1.0-PREVIEW.20151205 ../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 5c8e7407..b6be70f3 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.20151113" +LABEL version="1.1.0-PREVIEW.20151205" # 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 05899400..ef1691cd 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.20151113" +LABEL version="1.1.0-PREVIEW.20151205" 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 2c19fdec..c29d20d1 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.20151113" +LABEL version="1.1.0-PREVIEW.20151205" # 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 27da731b..339a3e82 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.20151113" +LABEL version="1.1.0-PREVIEW.20151205" # 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 f2aafd13..e74e799e 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.20151113" +LABEL version="1.1.0-PREVIEW.20151205" # 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 31c4d844..66013b4d 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.20151113" +LABEL version="1.1.0-PREVIEW.20151205" # 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/src/main/webapp/assets/tpl/help/page.html b/jsgui/src/main/webapp/assets/tpl/help/page.html index f07f3092..9d6ddaa4 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.20151113 + You are currently using Clocker Version 1.1.0-PREVIEW.20151205


References

diff --git a/patches/pom.xml b/patches/pom.xml index fec8be85..f41f57e9 100644 --- a/patches/pom.xml +++ b/patches/pom.xml @@ -22,7 +22,7 @@ brooklyn-clocker-parent io.brooklyn.clocker - 1.1.0-PREVIEW.20151113 + 1.1.0-PREVIEW.20151205 ../pom.xml diff --git a/pom.xml b/pom.xml index 1c35f4c5..aeadc9ff 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ io.brooklyn.clocker brooklyn-clocker-parent - 1.1.0-PREVIEW.20151113 + 1.1.0-PREVIEW.20151205 pom Clocker Project (Parent)