Merge branch 'release-5.2.2'

citusdata · Nov 8, 2016 · 8685eae · 8685eae
2 parents 675c26e + 7aac349
commit 8685eae
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### citus-docker v5.2.2 (November 8, 2016) ###
+
+* Bump Citus version to 5.2.2
+
+* Based on latest PostgreSQL 9.5.5 image and official Citus 5.2.2 package
+
 ### citus-docker v5.2.1-1.docker (September 16, 2016) ###
 
 * Preserves ca-certificates package in images to avoid breaking apt-get

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-FROM postgres:9.5.4
+FROM postgres:9.5.5
 MAINTAINER Citus Data https://citusdata.com
 
-ENV CITUS_VERSION 5.2.1.citus-1
+ENV CITUS_VERSION 5.2.2.citus-1
 
 # install Citus
 RUN apt-get update \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,11 +3,11 @@ version: '2'
 services:
   master:
     container_name: 'citus_master'
-    image: 'citusdata/citus:5.2.1'
+    image: 'citusdata/citus:5.2.2'
     ports: ['5432:5432']
     labels: ['com.citusdata.role=Master']
   worker:
-    image: 'citusdata/citus:5.2.1'
+    image: 'citusdata/citus:5.2.2'
     labels: ['com.citusdata.role=Worker']
   config:
     container_name: 'citus_config'

diff --git a/tutum.yml b/tutum.yml
@@ -1,11 +1,11 @@
 master:
-  image: 'citusdata/citus:5.2.1'
+  image: 'citusdata/citus:5.2.2'
   ports: ['5432:5432']
   tags: ['master']
   links: ['worker']
   deployment_strategy: every_node
 worker:
-  image: 'citusdata/citus:5.2.1'
+  image: 'citusdata/citus:5.2.2'
   target_num_containers: 2
   tags: ['worker']
 config: