Merge branch 'release-6.1.1'

Author: jasonmp85

CHANGELOG.md

@@ -1,3 +1,9 @@
+### citus-docker v6.1.1 (May 16, 2017) ###
+
+* Bump Citus version to 6.1.0
+
+* Based on latest PostgreSQL 9.6.3 image and official Citus 6.1.1 package
+
 ### citus-docker v6.1.0 (February 10, 2017) ###
 
 * Bump Citus version to 6.1.0

Dockerfile

@@ -1,7 +1,7 @@
-FROM postgres:9.6.2
+FROM postgres:9.6.3
 MAINTAINER Citus Data https://citusdata.com
 
-ENV CITUS_VERSION 6.1.0.citus-1
+ENV CITUS_VERSION 6.1.1.citus-1
 
 # install Citus
 RUN apt-get update \

README.md

@@ -8,7 +8,7 @@ Citus is a PostgreSQL-based distributed RDBMS. For more information, see the [Ci
 
 ## Function
 
-This image provides a single running Citus instance (atop PostgreSQL 9.5), using standard configuration values. It is based on [the official PostgreSQL image][docker-postgres], so be sure to consult that image’s documentation for advanced configuration options (including non-default settings for e.g. `PGDATA` or `POSTGRES_USER`).
+This image provides a single running Citus instance (atop PostgreSQL 9.6), using standard configuration values. It is based on [the official PostgreSQL image][docker-postgres], so be sure to consult that image’s documentation for advanced configuration options (including non-default settings for e.g. `PGDATA` or `POSTGRES_USER`).
 
 Just like the standard PostgreSQL image, this image exposes port `5432`. In other words, all containers on the same Docker network should be able to connect on this port, and exposing it externally will permit connections from external clients (`psql`, adapters, applications).
 

docker-compose.yml

@@ -3,12 +3,12 @@ version: '2'
 services:
   master:
     container_name: 'citus_master'
-    image: 'citusdata/citus:6.1.0'
+    image: 'citusdata/citus:6.1.1'
     ports: ['5432:5432']
     labels: ['com.citusdata.role=Master']
     volumes: ['/var/run/postgresql']
   worker:
-    image: 'citusdata/citus:6.1.0'
+    image: 'citusdata/citus:6.1.1'
     labels: ['com.citusdata.role=Worker']
   config:
     container_name: 'citus_config'

nightly/Dockerfile

@@ -9,6 +9,6 @@ RUN apt-key del 1530DF18 \
        ca-certificates \
        curl \
     && curl -s https://install.citusdata.com/community-nightlies/deb.sh | bash \
-    && apt-get install --only-upgrade -y postgresql-$PG_MAJOR-citus \
+    && apt-get install -y postgresql-$PG_MAJOR-citus \
     && apt-get purge -y --auto-remove curl \
     && rm -rf /var/lib/apt/lists/*