Merge branch 'hotfix/0.105.47'

CenterForOpenScience · Apr 19, 2017 · 49ad44f · 49ad44f
2 parents c76a245 + 74afe9a
commit 49ad44f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -1,5 +1,5 @@
 
-version: '2'
+version: '2.1'
 
 services:
 

diff --git a/docker-compose.ubuntu.yml b/docker-compose.ubuntu.yml
@@ -1,5 +1,5 @@
 
-version: '2'
+version: '2.1'
 
 services:
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,6 @@
 # Reference README-docker-compose.md for instructions.
 
-version: '2'
+version: '2.1'
 
 volumes:
   postgres_data_vol:
@@ -63,7 +63,7 @@ services:
         sed -i -e 's/max_connections.*/max_connections = 5000/' /var/lib/postgresql/data/postgresql.conf
         sed -i -e 's/#log_min_duration_statement = .*/log_min_duration_statement = 0/' /var/lib/postgresql/data/postgresql.conf
     volumes:
-      - postgres_data_vol:/var/lib/postgresql/data/
+      - "${POSTGRES_DATA_VOL:-postgres_data_vol}:/var/lib/postgresql/data/"
     stdin_open: true
 
   tokumx: