diff --git a/README.md b/README.md index f72492ae..eaff1203 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.20160118.svg)](https://imagelayers.io/?images=clockercentral/clocker:1.1.0-PREVIEW.20160118) +[![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.20160215.svg)](https://imagelayers.io/?images=clockercentral/clocker:1.1.0-PREVIEW.20160215) ## 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.20160118](https://github.com/brooklyncentral/clocker/releases/tag/v1.1.0-PREVIEW.20160118). +The latest version of Clocker is [1.1.0-PREVIEW.20160215](https://github.com/brooklyncentral/clocker/releases/tag/v1.1.0-PREVIEW.20160215). 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 e228dd8e..85685ea3 100644 --- a/clocker.bom +++ b/clocker.bom @@ -13,13 +13,13 @@ # limitations under the License. brooklyn.catalog: - version: "1.1.0-PREVIEW.20160118" # CLOCKER_VERSION + version: "1.1.0-PREVIEW.20160215" # CLOCKER_VERSION brooklyn.libraries: - - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0-PREVIEW.20160118/brooklyn-clocker-patches-1.1.0-PREVIEW.20160118.jar" # CLOCKER_VERSION - - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0-PREVIEW.20160118/brooklyn-clocker-docker-1.1.0-PREVIEW.20160118.jar" # CLOCKER_VERSION - - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-PREVIEW.20160118/brooklyn-clocker-dist-1.1.0-PREVIEW.20160118.jar" # CLOCKER_VERSION + - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0-PREVIEW.20160215/brooklyn-clocker-patches-1.1.0-PREVIEW.20160215.jar" # CLOCKER_VERSION + - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0-PREVIEW.20160215/brooklyn-clocker-docker-1.1.0-PREVIEW.20160215.jar" # CLOCKER_VERSION + - "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-PREVIEW.20160215/brooklyn-clocker-dist-1.1.0-PREVIEW.20160215.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 4d66b2f9..01d7492b 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -31,7 +31,7 @@ io.brooklyn.clocker brooklyn-clocker-parent - 1.1.0-PREVIEW.20160118 + 1.1.0-PREVIEW.20160215 ../pom.xml diff --git a/dist/Dockerfile b/dist/Dockerfile index ff5f26af..04c7268c 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.20160118" +LABEL version="1.1.0-PREVIEW.20160215" 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.20160118/brooklyn-clocker-dist-1.1.0-PREVIEW.20160118-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.20160215/brooklyn-clocker-dist-1.1.0-PREVIEW.20160215-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 bd97e725..eea2121e 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ brooklyn-clocker-parent io.brooklyn.clocker - 1.1.0-PREVIEW.20160118 + 1.1.0-PREVIEW.20160215 ../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 4ef475a4..6bfc8897 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.20160118 # CLOCKER_VERSION + version: 1.1.0-PREVIEW.20160215 # CLOCKER_VERSION items: # load everything in the classpath with a @Catalog annotation diff --git a/docker/pom.xml b/docker/pom.xml index c7b6f167..47c17c0e 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -22,7 +22,7 @@ brooklyn-clocker-parent io.brooklyn.clocker - 1.1.0-PREVIEW.20160118 + 1.1.0-PREVIEW.20160215 ../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 528b1048..16574c92 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.20160118" +LABEL version="1.1.0-PREVIEW.20160215" # 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 a0fd20f0..834c122a 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.20160118" +LABEL version="1.1.0-PREVIEW.20160215" 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 89b84e8b..4c40df0e 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.20160118" +LABEL version="1.1.0-PREVIEW.20160215" # 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 568b56cd..9377662d 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.20160118" +LABEL version="1.1.0-PREVIEW.20160215" # 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 30f29153..44194fe1 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.20160118" +LABEL version="1.1.0-PREVIEW.20160215" # 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 0f89504f..279da73f 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.20160118" +LABEL version="1.1.0-PREVIEW.20160215" # 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 e8017dd8..ba2a8f4e 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.20160118 + You are currently using Clocker Version 1.1.0-PREVIEW.20160215


References

diff --git a/jsgui/src/main/webapp/index.html b/jsgui/src/main/webapp/index.html index 00981cc3..744ca7cc 100644 --- a/jsgui/src/main/webapp/index.html +++ b/jsgui/src/main/webapp/index.html @@ -1,13 +1,13 @@ - + - Clocker 1.1.0-PREVIEW.20160118 + Clocker 1.1.0-PREVIEW.20160215 diff --git a/patches/pom.xml b/patches/pom.xml index 8429bf51..c118a1a1 100644 --- a/patches/pom.xml +++ b/patches/pom.xml @@ -22,7 +22,7 @@ brooklyn-clocker-parent io.brooklyn.clocker - 1.1.0-PREVIEW.20160118 + 1.1.0-PREVIEW.20160215 ../pom.xml diff --git a/pom.xml b/pom.xml index e8e7e4d6..431882cb 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ io.brooklyn.clocker brooklyn-clocker-parent - 1.1.0-PREVIEW.20160118 + 1.1.0-PREVIEW.20160215 pom Clocker Project (Parent)