From 7abc983ae2b45f000eb56df60d6c0d879f5b2146 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Tue, 7 Mar 2017 11:24:16 +0100
Subject: [PATCH] XDOCKER-5: Add an image using postgresql * Use postgresql:9.5
since there's a problem with 9.6 (possibly an incompatibility with the driver
version installed by libpostgresql-jdbc-java)
---
8/postgres-tomcat/docker-compose.yml | 2 +-
9/postgres-tomcat/docker-compose.yml | 2 +-
template/docker-compose.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/8/postgres-tomcat/docker-compose.yml b/8/postgres-tomcat/docker-compose.yml
index ddda6e3..34c8cae 100644
--- a/8/postgres-tomcat/docker-compose.yml
+++ b/8/postgres-tomcat/docker-compose.yml
@@ -46,7 +46,7 @@ services:
- bridge
# The container that runs the database (postgres)
db:
- image: "postgres:9.6"
+ image: "postgres:9.5"
container_name: xwiki-postgres-db
volumes:
- postgres-data:/var/lib/postgresql/data
diff --git a/9/postgres-tomcat/docker-compose.yml b/9/postgres-tomcat/docker-compose.yml
index ddda6e3..34c8cae 100644
--- a/9/postgres-tomcat/docker-compose.yml
+++ b/9/postgres-tomcat/docker-compose.yml
@@ -46,7 +46,7 @@ services:
- bridge
# The container that runs the database (postgres)
db:
- image: "postgres:9.6"
+ image: "postgres:9.5"
container_name: xwiki-postgres-db
volumes:
- postgres-data:/var/lib/postgresql/data
diff --git a/template/docker-compose.yml b/template/docker-compose.yml
index a70be18..ffaa6de 100644
--- a/template/docker-compose.yml
+++ b/template/docker-compose.yml
@@ -65,7 +65,7 @@ services:
- MYSQL_PASSWORD=\${DB_PASSWORD}
- MYSQL_DATABASE=\${DB_DATABASE}'''
- else if (db == 'postgres') print '''image: "postgres:9.6"
+ else if (db == 'postgres') print '''image: "postgres:9.5"
container_name: xwiki-postgres-db
volumes:
- postgres-data:/var/lib/postgresql/data
--
GitLab