Bump postgres JDBC driver and use full catalina.sh path

This commit is contained in:
Disassembler 2020-03-20 14:50:41 +01:00
parent 36181e3593
commit 35345dc529
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
3 changed files with 5 additions and 5 deletions

View File

@ -3,4 +3,4 @@
cd /srv/tomcat cd /srv/tomcat
fdmove -c 2 1 fdmove -c 2 1
s6-setuidgid tomcat s6-setuidgid tomcat
catalina.sh run /usr/bin/catalina.sh run

View File

@ -9,7 +9,7 @@ RUN EOF
# Update Postgres JDBC driver # Update Postgres JDBC driver
rm /srv/tomcat/webapps/ROOT/WEB-INF/lib/postgresql-42.1.4.jre7.jar 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 # Change webapps ownership
chown -R tomcat:tomcat /srv/tomcat/webapps chown -R tomcat:tomcat /srv/tomcat/webapps
@ -20,4 +20,4 @@ EOF
USER 8080 8080 USER 8080 8080
WORKDIR /srv/tomcat WORKDIR /srv/tomcat
CMD catalina.sh run CMD /usr/bin/catalina.sh run

View File

@ -9,7 +9,7 @@ RUN EOF
# Update Postgres JDBC driver # Update Postgres JDBC driver
rm /srv/tomcat/webapps/sigmah/WEB-INF/lib/postgresql-9.1-901-1.jdbc4.jar 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 # Remove logging config
rm /srv/tomcat/webapps/sigmah/WEB-INF/classes/logback.xml rm /srv/tomcat/webapps/sigmah/WEB-INF/classes/logback.xml
@ -29,4 +29,4 @@ COPY lxc
USER 8080 8080 USER 8080 8080
WORKDIR /srv/tomcat WORKDIR /srv/tomcat
CMD catalina.sh run CMD /usr/bin/catalina.sh run