Merge remote-tracking branch 'origin/develop'

citusdata · Mar 19, 2020 · 943fb63 · 943fb63
2 parents 07d3a38 + a614789
commit 943fb63
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,4 +4,4 @@ env:
   - DOCKERFILE=Dockerfile
   - DOCKERFILE=Dockerfile-alpine
 script:
-  - docker build -f "$DOCKERFILE" -t citusdata/citus:9.2.2 .
+  - docker build -f "$DOCKERFILE" -t citusdata/citus:9.2.2-1 .
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### citus-docker v9.2.2-1.docker (March 18, 2020) ###
+
+* Rollback PostgreSQL version to 12.1(see issue #170)
+
 ### citus-docker v9.2.2.docker (March 6, 2020) ###
 
 * Bump Citus version to 9.2.2

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM postgres:12.2
+FROM postgres:12.1
 ARG VERSION=9.2.2
 LABEL maintainer="Citus Data https://citusdata.com" \
       org.label-schema.name="Citus" \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,11 +3,11 @@ version: '2.1'
 services:
   master:
     container_name: "${COMPOSE_PROJECT_NAME:-citus}_master"
-    image: 'citusdata/citus:9.2.2'
+    image: 'citusdata/citus:9.2.2-1'
     ports: ["${MASTER_EXTERNAL_PORT:-5432}:5432"]
     labels: ['com.citusdata.role=Master']
   worker:
-    image: 'citusdata/citus:9.2.2'
+    image: 'citusdata/citus:9.2.2-1'
     labels: ['com.citusdata.role=Worker']
     depends_on: { manager: { condition: service_healthy } }
   manager: