Skip to content

Commit

Permalink
Merge branch 'release-5.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonmp85 committed Apr 16, 2016
2 parents ecce1cb + 5c60501 commit d9c4f53
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### citus-docker v5.0.1 (March 24, 2016) ###

* Install package from PGDG!

* Based on latest PostgreSQL 9.5.2 image and official Citus 5.0.1 package

### citus-docker v5.0.0 (March 24, 2016) ###

* Initial public release
Expand Down
11 changes: 5 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
FROM postgres:9.5.1
FROM postgres:9.5.2
MAINTAINER Citus Data https://citusdata.com

ENV CITUS_VERSION 5.0.1-1.pgdg80+1

# install Citus
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates wget \
&& wget -O /tmp/citus.deb -SL 'https://s3.amazonaws.com/packages.citusdata.com/debian/jessie/postgresql-9.5-citus_5.0.0-1_amd64.deb' \
&& dpkg --install /tmp/citus.deb \
&& rm /tmp/citus*.deb \
&& apt-get purge -y --auto-remove ca-certificates wget \
RUN apt-get update \
&& apt-get install -y postgresql-$PG_MAJOR-citus=$CITUS_VERSION \
&& rm -rf /var/lib/apt/lists/*

# add citus to default PostgreSQL config
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'
services:
master:
container_name: 'citus_master'
image: 'citusdata/citus:5.0.0'
image: 'citusdata/citus:5.0.1'
ports: ['5432:5432']
labels: ['com.citusdata.role=Master']
worker:
image: 'citusdata/citus:5.0.0'
image: 'citusdata/citus:5.0.1'
labels: ['com.citusdata.role=Worker']
config:
container_name: 'citus_config'
Expand Down
4 changes: 2 additions & 2 deletions tutum.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
master:
image: 'citusdata/citus:5.0.0'
image: 'citusdata/citus:5.0.1'
ports: ['5432:5432']
tags: ['master']
links: ['worker']
deployment_strategy: every_node
worker:
image: 'citusdata/citus:5.0.0'
image: 'citusdata/citus:5.0.1'
target_num_containers: 2
tags: ['worker']
config:
Expand Down

0 comments on commit d9c4f53

Please sign in to comment.