Merge branch 'release-6.0.0'

CHANGELOG.md

@@ -1,3 +1,9 @@
+### citus-docker v6.0.0 (November 9, 2016) ###
+
+* Bump Citus version to 6.0.0
+
+* Based on latest PostgreSQL 9.6.1 image and official Citus 6.0.0 package
+
 ### citus-docker v5.2.2 (November 8, 2016) ###
 
 * Bump Citus version to 5.2.2

Dockerfile

@@ -1,7 +1,7 @@
-FROM postgres:9.5.5
+FROM postgres:9.6.1
 MAINTAINER Citus Data https://citusdata.com
 
-ENV CITUS_VERSION 5.2.2.citus-1
+ENV CITUS_VERSION 6.0.0.citus-1
 
 # install Citus
 RUN apt-get update \

README.md

@@ -84,7 +84,7 @@ SELECT master_get_active_worker_nodes();
 -- (5 rows)
 ```
 
-If you inspect the configuration file, you’ll find that there is a container that is neither a master nor worker node: `citus_config`. It simply listens for new containers tagged with the worker role, then adds them to the config file in a volume shared with the master node. If nodes have been added or removed, it sends a `SIGHUP` signal to the master to reload the config. See Citus’ [`workerlist-gen`][workerlist-gen] repo for more details.
+If you inspect the configuration file, you’ll find that there is a container that is neither a master nor worker node: `citus_config`. It simply listens for new containers tagged with the worker role, then adds them to the config file in a volume shared with the master node. If new nodes have appeared, it calls `master_initialize_node_metadata` against the master to repopulate the node table. See Citus’ [`workerlist-gen`][workerlist-gen] repo for more details.
 
 You can stop your cluster with `docker-compose -p citus down`.
 

docker-compose.yml

@@ -3,14 +3,15 @@ version: '2'
 services:
   master:
     container_name: 'citus_master'
-    image: 'citusdata/citus:5.2.2'
+    image: 'citusdata/citus:6.0.0'
     ports: ['5432:5432']
     labels: ['com.citusdata.role=Master']
+    volumes: ['/var/run/postgresql']
   worker:
-    image: 'citusdata/citus:5.2.2'
+    image: 'citusdata/citus:6.0.0'
     labels: ['com.citusdata.role=Worker']
   config:
     container_name: 'citus_config'
-    image: 'citusdata/workerlist-gen:0.9.0'
+    image: 'citusdata/workerlist-gen:2.0.0'
     volumes: ['/var/run/docker.sock:/tmp/docker.sock']
     volumes_from: ['master']

nightly/docker-compose.yml

@@ -6,11 +6,12 @@ services:
     image: 'citusdata/citus:nightly'
     ports: ['5432:5432']
     labels: ['com.citusdata.role=Master']
+    volumes: ['/var/run/postgresql']
   worker:
     image: 'citusdata/citus:nightly'
     labels: ['com.citusdata.role=Worker']
   config:
     container_name: 'citus_config'
-    image: 'citusdata/workerlist-gen:0.9.0'
+    image: 'citusdata/workerlist-gen:2.0.0'
     volumes: ['/var/run/docker.sock:/tmp/docker.sock']
     volumes_from: ['master']

tutum.yml

@@ -9,7 +9,7 @@ worker:
   target_num_containers: 2
   tags: ['worker']
 config:
-  image: 'citusdata/dockercloud-workerlist-gen:0.9.0'
+  image: 'citusdata/dockercloud-workerlist-gen:1.0.0'
   volumes: ['/var/run/docker.sock:/tmp/docker.sock']
   volumes_from: ['master']
   roles: ['global']