From 2c0ee7485d5bfb5cb55ce3bf238a27f2fc3d70aa Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Sat, 25 Feb 2017 13:12:52 +0100
Subject: [PATCH] XDOCKER-5: Add an image using postgresql * More progress,
still not working
---
build.gradle | 2 +-
template/Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index a195b62..b858299 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
defaultTasks 'generate'
-def variants = ['mysql-tomcat']
+def variants = ['mysql-tomcat', 'postgres-tomcat']
def tokens = [
'8' : [
diff --git a/template/Dockerfile b/template/Dockerfile
index 61f2aac..91f09bb 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -54,7 +54,7 @@ RUN rm -rf /usr/local/tomcat/webapps/* && \\
<% if (db == 'mysql')
print 'RUN cp /usr/share/java/mysql-connector-java-*.jar /usr/local/tomcat/webapps/ROOT/WEB-INF/lib/'
else if (db == 'postgres')
- print '' %>
+ print 'RUN cp /usr/share/java/postgresql-jdbc4.jar /usr/local/tomcat/webapps/ROOT/WEB-INF/lib/' %>
# Configure Tomcat. For example set the memory for the Tomcat JVM since the default value is too small for XWiki
COPY tomcat/setenv.sh /usr/local/tomcat/bin/
--
GitLab