diff --git a/build.gradle b/build.gradle index a195b62c17221000641c8975385cf0f2b4ca8aa0..b85829952684cca251697662362a9bbc41855773 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 61f2aacd2d0429dc580cca0a503a3a609ee144e8..91f09bb5403c72bec670f91f353396477446b458 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/