Merge branch 'release-7.0.0'

citusdata · Aug 29, 2017 · 8357737 · 8357737
2 parents bd65d22 + 243f9fa
commit 8357737
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### citus-docker v7.0.0 (Aug 29, 2017) ###
+
+* Bump Citus version to 7.0.0
+
+* Based on latest PostgreSQL 9.6.4 image and official Citus 7.0.0 package
+
 ### citus-docker v6.2.3 (Jul 14, 2017) ###
 
 * Bump Citus version to 6.2.3

diff --git a/Dockerfile b/Dockerfile
@@ -1,15 +1,15 @@
-FROM postgres:9.6.3
+FROM postgres:9.6.4
 MAINTAINER Citus Data https://citusdata.com
 
-ENV CITUS_VERSION 6.2.3.citus-1
+ENV CITUS_VERSION 7.0.0.citus-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-6.2=$CITUS_VERSION \
+    && apt-get install -y postgresql-$PG_MAJOR-citus-7.0=$CITUS_VERSION \
     && apt-get purge -y --auto-remove curl \
     && rm -rf /var/lib/apt/lists/*
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,12 +3,12 @@ version: '2'
 services:
   master:
     container_name: 'citus_master'
-    image: 'citusdata/citus:6.2.3'
+    image: 'citusdata/citus:7.0.0'
     ports: ['5432:5432']
     labels: ['com.citusdata.role=Master']
     volumes: ['/var/run/postgresql']
   worker:
-    image: 'citusdata/citus:6.2.3'
+    image: 'citusdata/citus:7.0.0'
     labels: ['com.citusdata.role=Worker']
   config:
     container_name: 'citus_config'