Merge branch 'develop'

citusdata · Mar 31, 2020 · 44081b4 · 44081b4
2 parents 8a6aefe + ecdda18
commit 44081b4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 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.4 .
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### citus-docker v9.2.4.docker (March 31, 2020) ###
+
+* Bump Citus version to 9.2.4
+
 ### citus-docker v9.2.2-2.docker (March 30, 2020) ###
 
 * Downgrade Citus version to 9.2.2

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 FROM postgres:12.2
-ARG VERSION=9.2.2
+ARG VERSION=9.2.4
 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" \

diff --git a/Dockerfile-alpine b/Dockerfile-alpine
@@ -1,5 +1,5 @@
 FROM postgres:12.2-alpine
-ARG VERSION=9.2.2
+ARG VERSION=9.2.4
 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" \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2.1'
 services:
   master:
     container_name: "${COMPOSE_PROJECT_NAME:-citus}_master"
-    image: 'citusdata/citus:9.2.2'
+    image: 'citusdata/citus:9.2.4'
     ports: ["${MASTER_EXTERNAL_PORT:-5432}:5432"]
     labels: ['com.citusdata.role=Master']
     environment: &AUTH
@@ -13,7 +13,7 @@ services:
       PGPASSWORD: "${POSTGRES_PASSWORD}"
       POSTGRES_HOST_AUTH_METHOD: "${POSTGRES_HOST_AUTH_METHOD:-trust}"
   worker:
-    image: 'citusdata/citus:9.2.2'
+    image: 'citusdata/citus:9.2.4'
     labels: ['com.citusdata.role=Worker']
     depends_on: { manager: { condition: service_healthy } }
     environment: *AUTH