Merge pull request #52 from citusdata/release-7.1.0

Release 7.1.0

000-configure-stats.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# make bash behave
+set -euo pipefail
+IFS=$'\n\t'
+
+if [ -n "${DISABLE_STATS_COLLECTION+set}" ]; then
+  echo "Anonymous statistics collection disabled" >&2
+
+  echo 'citus.enable_statistics_collection=off' >> "${PGDATA}/postgresql.conf"
+  pg_ctl -D "${PGDATA}" reload -s
+fi

CHANGELOG.md

@@ -1,3 +1,7 @@
+### citus-docker v7.1.0 (November 15, 2017) ###
+
+* Bump Citus version to 7.1.0
+
 ### citus-docker v7.0.3 (October 18, 2017) ###
 
 * Bump Citus version to 7.0.3

Dockerfile

@@ -1,5 +1,5 @@
 FROM postgres:9.6.5
-ARG VERSION=7.0.3
+ARG VERSION=7.1.0
 LABEL maintainer="Citus Data https://citusdata.com" \
       org.label-schema.name="Citus" \
       org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \
@@ -17,15 +17,15 @@ RUN apt-get update \
        ca-certificates \
        curl \
     && curl -s https://install.citusdata.com/community/deb.sh | bash \
-    && apt-get install -y postgresql-$PG_MAJOR-citus-7.0=$CITUS_VERSION \
+    && apt-get install -y postgresql-$PG_MAJOR-citus-7.1=$CITUS_VERSION \
     && apt-get purge -y --auto-remove curl \
     && rm -rf /var/lib/apt/lists/*
 
 # add citus to default PostgreSQL config
 RUN echo "shared_preload_libraries='citus'" >> /usr/share/postgresql/postgresql.conf.sample
 
 # add scripts to run after initdb
-COPY 000-create-citus-extension.sql /docker-entrypoint-initdb.d/
+COPY 000-configure-stats.sh 001-create-citus-extension.sql /docker-entrypoint-initdb.d/
 
 # add health check script
 COPY pg_healthcheck /

Dockerfile-alpine

@@ -27,7 +27,7 @@ RUN apk add --no-cache \
 RUN echo "shared_preload_libraries='citus'" >> /usr/local/share/postgresql/postgresql.conf.sample
 
 # add scripts to run after initdb
-COPY 000-create-citus-extension.sql /docker-entrypoint-initdb.d/
+COPY 000-configure-stats.sh 001-create-citus-extension.sql /docker-entrypoint-initdb.d/
 
 # add health check script
 COPY pg_healthcheck /

docker-compose.yml

@@ -3,11 +3,11 @@ version: '2.1'
 services:
   master:
     container_name: "${COMPOSE_PROJECT_NAME:-citus}_master"
-    image: 'citusdata/citus:7.0.3'
+    image: 'citusdata/citus:7.1.0'
     ports: ["${MASTER_EXTERNAL_PORT:-5432}:5432"]
     labels: ['com.citusdata.role=Master']
   worker:
-    image: 'citusdata/citus:7.0.3'
+    image: 'citusdata/citus:7.1.0'
     labels: ['com.citusdata.role=Worker']
     depends_on: { manager: { condition: service_healthy } }
   manager: