Skip to content

Commit 3697f2d

Browse files
committed
Version 1.1.0
1 parent bae59d0 commit 3697f2d

File tree

29 files changed

+51
-50
lines changed

29 files changed

+51
-50
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Docker Cloud infrastructure.
1212
This repository contains all of the required Brooklyn entities, locations and examples.
1313

1414
<!-- CLOCKER_VERSION_BELOW -->
15-
[![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.20160402.svg)](https://imagelayers.io/?images=clockercentral/clocker:1.1.0-PREVIEW.20160402)
15+
[![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.2.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.svg)](https://imagelayers.io/?images=clockercentral/clocker:1.1.0)
1616

1717
## Getting started
1818

@@ -34,12 +34,12 @@ depending on your choice of SDN provider.
3434
### Using the latest Clocker release
3535

3636
<!-- CLOCKER_VERSION_BELOW -->
37-
The latest version of Clocker is [1.1.0-PREVIEW.20160402](https://github.com/brooklyncentral/clocker/releases/tag/v1.1.0-PREVIEW.20160402).
37+
The latest version of Clocker is [1.1.0](https://github.com/brooklyncentral/clocker/releases/tag/v1.1.0).
3838
You can deploy your own **Docker Cloud** with a Weave SDN by running these commands with the _network_ argument
3939
set to `weave`, to use Project Calico as your SDN provider, change the last argument to `calico` instead:
4040
```Bash
4141
% wget --no-check-certificate --quiet \
42-
-O brooklyn-clocker-dist.tar.gz http://git.io/v2rFC
42+
-O brooklyn-clocker-dist.tar.gz http://git.io/vwPri
4343
% tar zxf brooklyn-clocker-dist.tar.gz
4444
% cd brooklyn-clocker
4545
% ./bin/clocker.sh location network
@@ -62,7 +62,7 @@ _jclouds:softlayer:sjc01_, a group of machines as _byon:(hosts="10.1.2.3,10.1.2.
6262
location from your `brooklyn.properties` file as _named:alias_.
6363

6464
For all cloud locations you must first configure the `~/.brooklyn/brooklyn.properties` file with any
65-
necessary credentials and security details, and select an SSH key (defaulting to `~/.ssh/id_rsa`).
65+
necessary credentials and security details, and select an SSH key (defaulting to `~/.ssh/id\_rsa`).
6666
A basic `brooklyn.properties` file should look like the following:
6767

6868
```properties
@@ -124,7 +124,7 @@ Build and run this version of Clocker from source as follows:
124124
% cd clocker
125125
% mvn clean install
126126
...
127-
% tar zxf examples/target/brooklyn-clocker-dist.tar.gz
127+
% tar zxf dist/target/brooklyn-clocker-dist.tar.gz
128128
% cd brooklyn-clocker
129129
% ./bin/clocker.sh location network
130130
...

clocker.bom

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,20 @@
1313
# limitations under the License.
1414

1515
brooklyn.catalog:
16-
version: "1.1.0-PREVIEW.20160402" # CLOCKER_VERSION
16+
version: "1.1.0" # CLOCKER_VERSION
1717

1818
brooklyn.libraries:
1919

20-
- "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0-PREVIEW.20160402/brooklyn-clocker-patches-1.1.0-PREVIEW.20160402.jar" # CLOCKER_VERSION
21-
- "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0-PREVIEW.20160402/brooklyn-clocker-docker-1.1.0-PREVIEW.20160402.jar" # CLOCKER_VERSION
22-
- "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-PREVIEW.20160402/brooklyn-clocker-dist-1.1.0-PREVIEW.20160402.jar" # CLOCKER_VERSION
23-
- "https://s3-eu-west-1.amazonaws.com/brooklyn-clocker/patch-softlayer-clocker-137.jar"
24-
- "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
25-
- "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
26-
- "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-cloudstack/0.8.0-incubating/brooklyn-networking-cloudstack-0.8.0-incubating.jar" # ADVANCED_NETWORKING_VERSION
27-
- "https://repository.apache.org/service/local/repositories/releases/content/org/apache/jclouds/labs/docker/1.9.1/docker-1.9.1.jar"
28-
- "https://repository.apache.org/service/local/repositories/releases/content/org/apache/jclouds/api/cloudstack/1.9.1/cloudstack-1.9.1.jar"
20+
- "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-patches/1.1.0/brooklyn-clocker-patches-1.1.0.jar" # CLOCKER_VERSION
21+
- "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-extras/1.1.0/brooklyn-clocker-extras-1.1.0.jar" # CLOCKER_VERSION
22+
- "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-docker/1.1.0/brooklyn-clocker-docker-1.1.0.jar" # CLOCKER_VERSION
23+
- "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-mesos/1.1.0/brooklyn-clocker-mesos-1.1.0.jar" # CLOCKER_VERSION
24+
- "http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0/brooklyn-clocker-dist-1.1.0.jar" # CLOCKER_VERSION
25+
- "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-portforwarding/0.9.0/brooklyn-networking-portforwarding-0.9.0.jar" # ADVANCED_NETWORKING_VERSION
26+
- "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-common/0.9.0/brooklyn-networking-common-0.9.0.jar" # ADVANCED_NETWORKING_VERSION
27+
- "https://oss.sonatype.org/content/repositories/releases/io/brooklyn/networking/brooklyn-networking-cloudstack/0.9.0/brooklyn-networking-cloudstack-0.9.0.jar" # ADVANCED_NETWORKING_VERSION
28+
- "https://repository.apache.org/service/local/repositories/releases/content/org/apache/jclouds/labs/docker/1.9.2/docker-1.9.2.jar" # JCLOUDS_VERSION
29+
- "https://repository.apache.org/service/local/repositories/releases/content/org/apache/jclouds/api/cloudstack/1.9.2/cloudstack-1.9.2.jar" # JCLOUDS_VERSION
2930

3031
items:
3132

console/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<parent>
3232
<groupId>io.brooklyn.clocker</groupId>
3333
<artifactId>brooklyn-clocker-parent</artifactId>
34-
<version>1.1.0-PREVIEW.20160402</version> <!-- CLOCKER_VERSION -->
34+
<version>1.1.0</version> <!-- CLOCKER_VERSION -->
3535
<relativePath>../pom.xml</relativePath>
3636
</parent>
3737

dist/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ FROM gliderlabs/alpine:3.1
1616
MAINTAINER andrew.kennedy@cloudsoft.io
1717

1818
# CLOCKER_VERSION_BELOW
19-
LABEL version="1.1.0-PREVIEW.20160402"
19+
LABEL version="1.1.0"
2020

2121
RUN apk-install openjdk7-jre-base ; \
2222
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
2929
rm -f /tmp/certgen.sh
3030

3131
# CLOCKER_VERSION_BELOW
32-
RUN wget --no-check-certificate http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0-PREVIEW.20160402/brooklyn-clocker-dist-1.1.0-PREVIEW.20160402-dist.tar.gz -O /brooklyn-clocker-dist.tar.gz ; \
32+
RUN wget --no-check-certificate http://ccweb.cloudsoftcorp.com/maven/libs-release-local/io/brooklyn/clocker/brooklyn-clocker-dist/1.1.0/brooklyn-clocker-dist-1.1.0-dist.tar.gz -O /brooklyn-clocker-dist.tar.gz ; \
3333
tar zxf brooklyn-clocker-dist.tar.gz ; \
3434
rm -f brooklyn-clocker-dist.tar.gz
3535

dist/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>brooklyn-clocker-parent</artifactId>
2424
<groupId>io.brooklyn.clocker</groupId>
25-
<version>1.1.0-PREVIEW.20160402</version> <!-- CLOCKER_VERSION -->
25+
<version>1.1.0</version> <!-- CLOCKER_VERSION -->
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
brooklyn.catalog:
16-
version: 1.1.0-PREVIEW.20160402 # CLOCKER_VERSION
16+
version: 1.1.0 # CLOCKER_VERSION
1717
items:
1818

1919
# load everything in the classpath with a @Catalog annotation

dist/src/test/resources/quality_assurance/apps/nodejs_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ brooklyn.catalog:
1818
#TEST 1- Ensure that the nodejs-demo works as expected
1919
- type: org.apache.brooklyn.test.framework.TestCase
2020
brooklyn.children:
21-
- type: "nodejs-demo-application:1.1.0-SNAPSHOT" # CLOCKER_VERSION
21+
- type: "nodejs-demo-application:1.1.0" # CLOCKER_VERSION
2222
id: nodejs-demo
2323
brooklyn.children:
2424
- type: org.apache.brooklyn.test.framework.TestSensor

dist/src/test/resources/quality_assurance/combined_test.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
brooklyn.catalog:
22
id: test
3-
version: 1.1.0-SNAPSHOT # CLOCKER_VERSION
3+
version: 1.1.0 # CLOCKER_VERSION
44
name: Test
55
itemType: template
66
item:
77
services:
8-
- type: "TestApp:1.1.0-SNAPSHOT" # CLOCKER_VERSION
8+
- type: "TestApp:1.1.0" # CLOCKER_VERSION
99
brooklyn.config:
1010
appToTest:
1111
$brooklyn:entitySpec:
12-
- type: "docker-cloud-single:1.1.0-SNAPSHOT" # CLOCKER_VERSION
12+
- type: "docker-cloud-single:1.1.0" # CLOCKER_VERSION
1313
id: infrastructure1
1414
brooklyn.config:
1515
docker.host.cluster.initial.size: 2
1616
docker.registry.start: false
1717
docker.version: 1.10.3 # DOCKER_VERSION
1818
entity.dynamicLocation.name: ""
19-
- type: "TestApp:1.1.0-SNAPSHOT" # CLOCKER_VERSION
19+
- type: "TestApp:1.1.0" # CLOCKER_VERSION
2020
brooklyn.config:
2121
appToTest:
2222
$brooklyn:entitySpec:
23-
- type: "docker-cloud-calico:1.1.0-SNAPSHOT" # CLOCKER_VERSION
23+
- type: "docker-cloud-calico:1.1.0" # CLOCKER_VERSION
2424
id: infrastructure2
2525
brooklyn.config:
2626
docker.host.cluster.initial.size: 2

dist/src/test/resources/quality_assurance/deploy_sdn_app_test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
brooklyn.catalog:
22
id: sdn-test
3-
version: 1.1.0-SNAPSHOT # CLOCKER_VERSION
3+
version: 1.1.0 # CLOCKER_VERSION
44
name: SDN Test
55
itemType: template
66
item:
@@ -10,7 +10,7 @@ brooklyn.catalog:
1010
infrastructure.deployment.location.sensor: entity.dynamicLocation
1111
infrastructure.deployment.spec:
1212
$brooklyn:entitySpec:
13-
- type: "docker-cloud-calico:1.1.0-SNAPSHOT" # CLOCKER_VERSION
13+
- type: "docker-cloud-calico:1.1.0" # CLOCKER_VERSION
1414
id: infrastructure
1515
brooklyn.config:
1616
entity.dynamicLocation.name: my-docker-cloud

dist/src/test/resources/quality_assurance/deploy_simple_app_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
brooklyn.catalog:
22
id: simple-test
3-
version: 1.1.0-SNAPSHOT # CLOCKER_VERSION
3+
version: 1.1.0 # CLOCKER_VERSION
44
name: Simple Test
55
itemType: template
66
item:

0 commit comments

Comments
 (0)