Skip to content

Commit

Permalink
Merge pull request #93 from citusdata/release-7.5.0-develop-1532526478
Browse files Browse the repository at this point in the history
Bump docker to 7.5.0
  • Loading branch information
furkansahin authored Jul 25, 2018
2 parents ba92dad + 70beb67 commit c195a30
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sudo: required
services: [ docker ]
script:
- docker build -t citusdata/citus:7.4.1 .
- docker build -t citusdata/citus:7.5.0 .
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### citus-docker v7.5.0.docker (July 25, 2018) ###

* Bump Citus version to 7.5.0

* Bump PostgreSQL version to 10.4

### citus-docker v7.4.1.docker (June 20, 2018) ###

* Bump Citus version to 7.4.1
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM postgres:10.3
ARG VERSION=7.4.1
FROM postgres:10.4
ARG VERSION=7.5.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" \
Expand All @@ -17,7 +17,7 @@ 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.4=$CITUS_VERSION \
&& apt-get install -y postgresql-$PG_MAJOR-citus-7.5=$CITUS_VERSION \
postgresql-$PG_MAJOR-hll=2.10.2.citus-1 \
postgresql-$PG_MAJOR-topn=2.0.2 \
&& apt-get purge -y --auto-remove curl \
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ version: '2.1'
services:
master:
container_name: "${COMPOSE_PROJECT_NAME:-citus}_master"
image: 'citusdata/citus:7.4.1'
image: 'citusdata/citus:7.5.0'
ports: ["${MASTER_EXTERNAL_PORT:-5432}:5432"]
labels: ['com.citusdata.role=Master']
worker:
image: 'citusdata/citus:7.4.1'
image: 'citusdata/citus:7.5.0'
labels: ['com.citusdata.role=Worker']
depends_on: { manager: { condition: service_healthy } }
manager:
Expand Down

0 comments on commit c195a30

Please sign in to comment.