From 35345dc5292bcf83f6edee54b691063517dd35d5 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Fri, 20 Mar 2020 14:50:41 +0100
Subject: [PATCH] Bump postgres JDBC driver and use full catalina.sh path

---
 lxc-apps/mifosx/image.d/etc/services.d/tomcat/run | 2 +-
 lxc-apps/opendatakit/opendatakit.lxcfile          | 4 ++--
 lxc-apps/sigmah/lxcfile                           | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lxc-apps/mifosx/image.d/etc/services.d/tomcat/run b/lxc-apps/mifosx/image.d/etc/services.d/tomcat/run
index 35cee30..e581f65 100755
--- a/lxc-apps/mifosx/image.d/etc/services.d/tomcat/run
+++ b/lxc-apps/mifosx/image.d/etc/services.d/tomcat/run
@@ -3,4 +3,4 @@
 cd /srv/tomcat
 fdmove -c 2 1
 s6-setuidgid tomcat
-catalina.sh run
+/usr/bin/catalina.sh run
diff --git a/lxc-apps/opendatakit/opendatakit.lxcfile b/lxc-apps/opendatakit/opendatakit.lxcfile
index 5802ff0..f1bb40d 100644
--- a/lxc-apps/opendatakit/opendatakit.lxcfile
+++ b/lxc-apps/opendatakit/opendatakit.lxcfile
@@ -9,7 +9,7 @@ RUN EOF
 
     # Update Postgres JDBC driver
     rm /srv/tomcat/webapps/ROOT/WEB-INF/lib/postgresql-42.1.4.jre7.jar
-    wget https://jdbc.postgresql.org/download/postgresql-42.2.5.jar -O /srv/tomcat/webapps/ROOT/WEB-INF/lib/postgresql-42.2.5.jar
+    wget https://jdbc.postgresql.org/download/postgresql-42.2.11.jar -O /srv/tomcat/webapps/ROOT/WEB-INF/lib/postgresql-42.2.11.jar
 
     # Change webapps ownership
     chown -R tomcat:tomcat /srv/tomcat/webapps
@@ -20,4 +20,4 @@ EOF
 
 USER 8080 8080
 WORKDIR /srv/tomcat
-CMD catalina.sh run
+CMD /usr/bin/catalina.sh run
diff --git a/lxc-apps/sigmah/lxcfile b/lxc-apps/sigmah/lxcfile
index 2cff2d0..c98303a 100644
--- a/lxc-apps/sigmah/lxcfile
+++ b/lxc-apps/sigmah/lxcfile
@@ -9,7 +9,7 @@ RUN EOF
 
     # Update Postgres JDBC driver
     rm /srv/tomcat/webapps/sigmah/WEB-INF/lib/postgresql-9.1-901-1.jdbc4.jar
-    wget https://jdbc.postgresql.org/download/postgresql-42.2.5.jar -O /srv/tomcat/webapps/sigmah/WEB-INF/lib/postgresql-42.2.5.jar
+    wget https://jdbc.postgresql.org/download/postgresql-42.2.11.jar -O /srv/tomcat/webapps/sigmah/WEB-INF/lib/postgresql-42.2.11.jar
 
     # Remove logging config
     rm /srv/tomcat/webapps/sigmah/WEB-INF/classes/logback.xml
@@ -29,4 +29,4 @@ COPY lxc
 
 USER 8080 8080
 WORKDIR /srv/tomcat
-CMD catalina.sh run
+CMD /usr/bin/catalina.sh run