Skip to content

Commit

Permalink
minor notes, bump travis sleep
Browse files Browse the repository at this point in the history
  • Loading branch information
bitsofinfo committed Jan 24, 2018
1 parent 0df5f01 commit a125c38
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ script:
- docker service scale hazelcast-docker-swarm-discovery-spi-test=10

# Let cluster form w/ 10 nodes and verify there are 10 hz members
- sleep 60
- sleep 80
- docker ps
- docker logs $CONTAINER1_ID
- export CONTAINER10_ID=`docker ps -f "name=hazelcast-docker-swarm-discovery-spi-test.10" --format "{{.ID}}"`
Expand All @@ -63,7 +63,7 @@ script:

# Scale cluster down to 2 nodes, wait 2 minutes then verify only 2 nodes
- docker service scale hazelcast-docker-swarm-discovery-spi-test=2
- sleep 60
- sleep 80
- docker ps
- export CONTAINERX_ID=`docker ps -f "name=hazelcast-docker-swarm-discovery-spi-test." --format "{{.ID}}"`
- CONTAINERX_ID=`echo $CONTAINERX_ID | awk '{ print $1 }'`
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ This is release candidate code, tested against Hazelcast 3.6-EA+ through 3.9.x S

* MASTER - in progress, this README refers to what is in the master tag. **Switch to relevant RELEASE tag above to see that version's README**

* [1.0-RC6](https://github.com/bitsofinfo/hazelcast-docker-swarm-discovery-spi/releases/tag/1.0-RC6): **For Hazelcast 3.9+ only**. Added support for swarm dnsrr based discovery, thanks [Cardds](https://github.com/Cardds), https://github.com/bitsofinfo/hazelcast-docker-swarm-discovery-spi/pull/10

* [1.0-RC5](https://github.com/bitsofinfo/hazelcast-docker-swarm-discovery-spi/releases/tag/1.0-RC5): **For Hazelcast 3.9+ only**. Added support for SSL swarm manager URIs and skip verify for SSL.

* [1.0-RC4](https://github.com/bitsofinfo/hazelcast-docker-swarm-discovery-spi/releases/tag/1.0-RC4): **For Hazelcast 3.9+ only**. Changed gradle dependencies for HZ `3.9.+` & spotify docker-client for `8.+`. Implemented new `MemberAddressProvider` SPI, as alternative option to using `SwarmAddressPicker`
Expand Down Expand Up @@ -57,7 +59,7 @@ repositories {
dependencies {
// <!-- Use 1.0.RC3 for Hazelcast < 3.8.x -->
compile 'org.bitsofinfo:hazelcast-docker-swarm-discovery-spi:1.0-RC5'
compile 'org.bitsofinfo:hazelcast-docker-swarm-discovery-spi:1.0-RC6'
}
```

Expand All @@ -68,7 +70,7 @@ dependencies {
<dependency>
<groupId>org.bitsofinfo</groupId>
<artifactId>hazelcast-docker-swarm-discovery-spi</artifactId>
<version>1.0-RC5</version> <!-- Use 1.0.RC3 for Hazelcast < 3.8.x -->
<version>1.0-RC6</version> <!-- Use 1.0.RC3 for Hazelcast < 3.8.x -->
</dependency>
</dependencies>
Expand Down Expand Up @@ -131,7 +133,7 @@ HazelcastInstance hazelcastInstance = HazelcastInstanceFactory

### Option 2: Swarm DNSRR network binding via DockerDNSRRMemberAddressProvider

*Note this is only available for Hazelcast 3.9+. apps*
*Note this is only available in RC6+ and only for Hazelcast 3.9+. apps*

Configure your hazelcast.xml configuration file to use the `DockerDNSRRDiscoveryStrategy` and `DockerDNSRRMemberAddressProvider` (similar to the below): [See hazelcast-docker-swarm-dnsrr-discovery-spi-example.xml](src/main/resources/hazelcast-docker-swarm-dnsrr-discovery-spi-example.xml) for an example with documentation of options.

Expand Down
2 changes: 1 addition & 1 deletion Test.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM java:8u111-jre-alpine

ADD build/libs/hazelcast-docker-swarm-discovery-spi-1.0-RC5-all.jar /test.jar
ADD build/libs/hazelcast-docker-swarm-discovery-spi-1.0-RC6-all.jar /test.jar


# Create our entrypoint
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=1.0-RC5
version=1.0-RC6
description=hazelcast-docker-swarm-discovery-spi - Docker swarm based discovery strategy SPI for Hazelcast enabled applications

0 comments on commit a125c38

Please sign in to comment.