Ease selecting Postgres version for development and tests

dalibo · Aug 2, 2018 · 3f7db2e · 3f7db2e
1 parent 23ca4df
commit 3f7db2e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 
 services:
   ldap:
@@ -18,7 +18,7 @@ services:
       com.dnsdock.alias: ldap.ldap2pg.docker
 
   postgres:
-    image: postgres:10-alpine
+    image: postgres:${PGVERSION-10}-alpine
     volumes:
     - ./fixtures/postgres.sh:/docker-entrypoint-initdb.d/fixture.sh
     labels:

diff --git a/tests/func/docker-compose.yml b/tests/func/docker-compose.yml
@@ -14,7 +14,7 @@ services:
     domainname: ldap2pg.docker
 
   postgres:
-    image: postgres:10-alpine
+    image: postgres:${PGVERSION-10}-alpine
 
   runner:
     image: ${DIST-centos:7}