From fb36402c8573842f8a07477b6daa8bae63914d35 Mon Sep 17 00:00:00 2001
From: Jason Petersen <jason@citusdata.com>
Date: Thu, 7 Jul 2016 12:22:11 -0600
Subject: [PATCH 1/2] Address minor bug with nightly build

Need to remove traces of previous repo.
---
 nightly/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nightly/Dockerfile b/nightly/Dockerfile
index cd927c5..1fabdd6 100644
--- a/nightly/Dockerfile
+++ b/nightly/Dockerfile
@@ -2,7 +2,8 @@ FROM citusdata/citus:latest
 MAINTAINER Citus Data https://citusdata.com
 
 # switch to Citus nightly
-RUN apt-get update \
+RUN rm -rf /etc/apt/sources.list.d/citusdata_community.list \
+    && apt-get update \
     && apt-get install -y --no-install-recommends \
        ca-certificates \
        curl \

From 469ebfaf023e2be762fbb2a4b14f7b0cd37b9d5c Mon Sep 17 00:00:00 2001
From: Jason Petersen <jason@citusdata.com>
Date: Wed, 17 Aug 2016 15:48:02 -0600
Subject: [PATCH 2/2] Bump to Citus v5.2.0 and PostgreSQL 9.5.4

See those projects' CHANGELOGs for more details.
---
 CHANGELOG.md       | 6 ++++++
 Dockerfile         | 4 ++--
 docker-compose.yml | 4 ++--
 tutum.yml          | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1aa6ad8..7cc5724 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### citus-docker v5.2.0 (August 17, 2016) ###
+
+* Bump Citus version to 5.2.0; brings schemas, SERIAL, RETURNING, transactions
+
+* Based on latest PostgreSQL 9.5.4 image and official Citus 5.2.0 package
+
 ### citus-docker v5.1.1 (July 7, 2016) ###
 
 * This image now uses repos.citusdata.com (offical Citus package repo)
diff --git a/Dockerfile b/Dockerfile
index 2d33f21..65ebd96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM postgres:9.5.3
+FROM postgres:9.5.4
 MAINTAINER Citus Data https://citusdata.com
 
-ENV CITUS_VERSION 5.1.1-1
+ENV CITUS_VERSION 5.2.0.citus-1
 
 # install Citus
 RUN apt-get update \
diff --git a/docker-compose.yml b/docker-compose.yml
index e0d04b3..55d4520 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,11 +3,11 @@ version: '2'
 services:
   master:
     container_name: 'citus_master'
-    image: 'citusdata/citus:5.1.1'
+    image: 'citusdata/citus:5.2.0'
     ports: ['5432:5432']
     labels: ['com.citusdata.role=Master']
   worker:
-    image: 'citusdata/citus:5.1.1'
+    image: 'citusdata/citus:5.2.0'
     labels: ['com.citusdata.role=Worker']
   config:
     container_name: 'citus_config'
diff --git a/tutum.yml b/tutum.yml
index f772022..b3cc15b 100644
--- a/tutum.yml
+++ b/tutum.yml
@@ -1,11 +1,11 @@
 master:
-  image: 'citusdata/citus:5.1.1'
+  image: 'citusdata/citus:5.2.0'
   ports: ['5432:5432']
   tags: ['master']
   links: ['worker']
   deployment_strategy: every_node
 worker:
-  image: 'citusdata/citus:5.1.1'
+  image: 'citusdata/citus:5.2.0'
   target_num_containers: 2
   tags: ['worker']
 config: