Merge branch 'release-5.1.1'

CHANGELOG.md

@@ -1,3 +1,11 @@
+### citus-docker v5.1.1 (July 7, 2016) ###
+
+* This image now uses repos.citusdata.com (offical Citus package repo)
+
+* Bump Citus version to 5.1.1; improves task tracker and count distinct
+
+* Based on latest PostgreSQL 9.5.3 image and official Citus 5.1.1 package
+
 ### citus-docker v5.1.0 (May 17, 2016) ###
 
 * Bump Citus version to 5.1.0; brings COPY, EXPLAIN, and more performance

Dockerfile

@@ -1,11 +1,16 @@
 FROM postgres:9.5.3
 MAINTAINER Citus Data https://citusdata.com
 
-ENV CITUS_VERSION 5.1.0-1.pgdg80+1
+ENV CITUS_VERSION 5.1.1-1
 
 # install Citus
 RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+       ca-certificates \
+       curl \
+    && curl -s https://install.citusdata.com/community/deb.sh | bash \
     && apt-get install -y postgresql-$PG_MAJOR-citus=$CITUS_VERSION \
+    && apt-get purge -y --auto-remove ca-certificates curl \
     && rm -rf /var/lib/apt/lists/*
 
 # add citus to default PostgreSQL config

README.md

@@ -28,6 +28,10 @@ If you’re using `docker-machine`, you might want to run `docker-machine ip` to
 
 As with the PostgreSQL image, the default `PGDATA` directory will be mounted as a volume, so it will persist between restarts of the container. But while the above _will_ get you a running Citus instance, it won’t have any workers to exercise distributed query planning. For that, you may wish to try the included [`docker-compose.yml`][compose-config] configuration.
 
+#### Nightly Image
+
+In addition to the `latest` (release) tag and the major-, minor-, and patch-specific tags, the `Dockerfile` in the `nightly` directory builds a tagged image with the latest Citus nightly (from the Citus `master` branch).
+
 ### Docker Compose
 
 The included `docker-compose.yml` file provides an easy way to get started with a Citus cluster, complete with multiple workers. Just copy it to your current directory and run:

docker-compose.yml

@@ -3,11 +3,11 @@ version: '2'
 services:
   master:
     container_name: 'citus_master'
-    image: 'citusdata/citus:5.1.0'
+    image: 'citusdata/citus:5.1.1'
     ports: ['5432:5432']
     labels: ['com.citusdata.role=Master']
   worker:
-    image: 'citusdata/citus:5.1.0'
+    image: 'citusdata/citus:5.1.1'
     labels: ['com.citusdata.role=Worker']
   config:
     container_name: 'citus_config'

nightly/Dockerfile

@@ -0,0 +1,12 @@
+FROM citusdata/citus:latest
+MAINTAINER Citus Data https://citusdata.com
+
+# switch to Citus nightly
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+       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 purge -y --auto-remove ca-certificates curl \
+    && rm -rf /var/lib/apt/lists/*

nightly/docker-compose.yml

@@ -0,0 +1,16 @@
+version: '2'
+
+services:
+  master:
+    container_name: 'citus_master'
+    image: 'citusdata/citus:nightly'
+    ports: ['5432:5432']
+    labels: ['com.citusdata.role=Master']
+  worker:
+    image: 'citusdata/citus:nightly'
+    labels: ['com.citusdata.role=Worker']
+  config:
+    container_name: 'citus_config'
+    image: 'citusdata/workerlist-gen:0.9.0'
+    volumes: ['/var/run/docker.sock:/tmp/docker.sock']
+    volumes_from: ['master']

tutum.yml

@@ -1,11 +1,11 @@
 master:
-  image: 'citusdata/citus:5.1.0'
+  image: 'citusdata/citus:5.1.1'
   ports: ['5432:5432']
   tags: ['master']
   links: ['worker']
   deployment_strategy: every_node
 worker:
-  image: 'citusdata/citus:5.1.0'
+  image: 'citusdata/citus:5.1.1'
   target_num_containers: 2
   tags: ['worker']
 config: