Skip to content

Commit

Permalink
Version 1.1.0-PREVIEW.20160324
Browse files Browse the repository at this point in the history
grkvlt committed Mar 24, 2016

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent af935b3 commit b552376
Showing 19 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ Docker Cloud infrastructure.
This repository contains all of the required Brooklyn entities, locations and examples.

<!-- CLOCKER_VERSION_BELOW -->
[![Build Status](https://api.travis-ci.org/brooklyncentral/clocker.svg?branch=master)](https://travis-ci.org/brooklyncentral/clocker)&nbsp;[![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/)&nbsp;[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/brooklyncentral/clocker)&nbsp;[![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)&nbsp;[![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/)&nbsp;[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/brooklyncentral/clocker)&nbsp;[![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

<!-- CLOCKER_VERSION_BELOW -->
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
8 changes: 4 additions & 4 deletions clocker.bom
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion console/pom.xml
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@
<parent>
<groupId>io.brooklyn.clocker</groupId>
<artifactId>brooklyn-clocker-parent</artifactId>
<version>1.1.0-PREVIEW.20160229</version> <!-- CLOCKER_VERSION -->
<version>1.1.0-PREVIEW.20160324</version> <!-- CLOCKER_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

4 changes: 2 additions & 2 deletions dist/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion dist/pom.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<parent>
<artifactId>brooklyn-clocker-parent</artifactId>
<groupId>io.brooklyn.clocker</groupId>
<version>1.1.0-PREVIEW.20160229</version> <!-- CLOCKER_VERSION -->
<version>1.1.0-PREVIEW.20160324</version> <!-- CLOCKER_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

2 changes: 1 addition & 1 deletion dist/src/main/assembly/conf/brooklyn/default.catalog.bom
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion docker/pom.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<parent>
<artifactId>brooklyn-clocker-parent</artifactId>
<groupId>io.brooklyn.clocker</groupId>
<version>1.1.0-PREVIEW.20160229</version> <!-- CLOCKER_VERSION -->
<version>1.1.0-PREVIEW.20160324</version> <!-- CLOCKER_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion jsgui/pom.xml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
<parent>
<groupId>io.brooklyn.clocker</groupId>
<artifactId>brooklyn-clocker-parent</artifactId>
<version>1.1.0-PREVIEW.20160229</version> <!-- CLOCKER_VERSION -->
<version>1.1.0-PREVIEW.20160324</version> <!-- CLOCKER_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

2 changes: 1 addition & 1 deletion jsgui/src/main/webapp/assets/tpl/help/page.html
Original file line number Diff line number Diff line change
@@ -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.20160229 <!-- CLOCKER_VERSION -->
You are currently using Clocker Version 1.1.0-PREVIEW.20160324 <!-- CLOCKER_VERSION -->
</p>
<hr/>
<h3>References</h3>
4 changes: 2 additions & 2 deletions jsgui/src/main/webapp/index.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<!-- github GIT_SHA_1 -->
<!-- clocker 1.1.0-PREVIEW.20160229 --> <!-- CLOCKER_VERSION -->
<!-- clocker 1.1.0-PREVIEW.20160324 --> <!-- CLOCKER_VERSION -->
<!-- brooklyn 0.9.0-SNAPSHOT --> <!-- BROOKLYN_VERSION -->
<!-- advanced-networking 0.9.0-SNAPSHOT --> <!-- ADVANCED_NETWORKING_VERSION -->
<!-- jclouds 1.9.2 --> <!-- JCLOUDS_VERSION -->
<html>
<head>
<meta charset='utf-8'/>
<title>Clocker 1.1.0-PREVIEW.20160229</title><!-- CLOCKER_VERSION -->
<title>Clocker 1.1.0-PREVIEW.20160324</title><!-- CLOCKER_VERSION -->

<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
2 changes: 1 addition & 1 deletion mesos/pom.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<parent>
<artifactId>brooklyn-clocker-parent</artifactId>
<groupId>io.brooklyn.clocker</groupId>
<version>1.1.0-SNAPSHOT</version> <!-- CLOCKER_VERSION -->
<version>1.1.0-PREVIEW.20160324</version> <!-- CLOCKER_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

2 changes: 1 addition & 1 deletion patches/pom.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<parent>
<artifactId>brooklyn-clocker-parent</artifactId>
<groupId>io.brooklyn.clocker</groupId>
<version>1.1.0-PREVIEW.20160229</version> <!-- CLOCKER_VERSION -->
<version>1.1.0-PREVIEW.20160324</version> <!-- CLOCKER_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@

<groupId>io.brooklyn.clocker</groupId>
<artifactId>brooklyn-clocker-parent</artifactId>
<version>1.1.0-PREVIEW.20160229</version> <!-- CLOCKER_VERSION -->
<version>1.1.0-PREVIEW.20160324</version> <!-- CLOCKER_VERSION -->
<packaging>pom</packaging>
<name>Clocker Project (Parent)</name>
<description>

0 comments on commit b552376

Please sign in to comment.