Merge branch 'release-5.2.0'

citusdata · Aug 17, 2016 · c15cc00 · c15cc00
2 parents 64d9dba + 469ebfa
commit c15cc00
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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/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 \

diff --git 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: