Bump Motech to Alpine 3.12

This commit is contained in:
Disassembler 2020-10-22 22:58:17 +02:00
parent a763665f32
commit d2082a896b
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
2 changed files with 8 additions and 8 deletions

View File

@ -1,5 +1,5 @@
{ {
"version": "1.3.0-200621", "version": "1.3.0-201021",
"meta": { "meta": {
"title": "Motech", "title": "Motech",
"desc-cs": "Automatizace komunikace", "desc-cs": "Automatizace komunikace",
@ -8,7 +8,7 @@
}, },
"containers": { "containers": {
"motech": { "motech": {
"image": "motech_1.3.0-200621", "image": "motech_1.3.0-201021",
"depends": [ "depends": [
"motech-activemq", "motech-activemq",
"motech-postgres" "motech-postgres"
@ -18,14 +18,14 @@
} }
}, },
"motech-activemq": { "motech-activemq": {
"image": "activemq_5.15.13-200621", "image": "activemq_5.16.0-201021",
"mounts": { "mounts": {
"motech/activemq_conf/activemq.xml": "srv/activemq/conf/activemq.xml:file", "motech/activemq_conf/activemq.xml": "srv/activemq/conf/activemq.xml:file",
"motech/activemq_data": "srv/activemq/data" "motech/activemq_data": "srv/activemq/data"
} }
}, },
"motech-postgres": { "motech-postgres": {
"image": "postgres_12.2.0-200621", "image": "postgres_12.4.0-201021",
"mounts": { "mounts": {
"motech/postgres_data": "var/lib/postgresql" "motech/postgres_data": "var/lib/postgresql"
} }

View File

@ -1,5 +1,5 @@
IMAGE motech_1.3.0-200621 IMAGE motech_1.3.0-201021
FROM alpine3.11-tomcat7_7.0.104-200621 FROM alpine3.12-tomcat7_7.0.106-201021
RUN EOF RUN EOF
# Download Motech # Download Motech
@ -9,8 +9,8 @@ RUN EOF
# Update Postgres JDBC driver # Update Postgres JDBC driver
rm -f /srv/tomcat/webapps/ROOT/WEB-INF/lib/postgresql-9.1-901.jdbc4.jar /srv/tomcat/webapps/ROOT/WEB-INF/bundles/postgresql-9.1-901.jdbc4.jar rm -f /srv/tomcat/webapps/ROOT/WEB-INF/lib/postgresql-9.1-901.jdbc4.jar /srv/tomcat/webapps/ROOT/WEB-INF/bundles/postgresql-9.1-901.jdbc4.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 wget https://jdbc.postgresql.org/download/postgresql-42.2.18.jar -O /srv/tomcat/webapps/ROOT/WEB-INF/lib/postgresql-42.2.18.jar
cp /srv/tomcat/webapps/ROOT/WEB-INF/lib/postgresql-42.2.11.jar /srv/tomcat/webapps/ROOT/WEB-INF/bundles/postgresql-42.2.11.jar cp /srv/tomcat/webapps/ROOT/WEB-INF/lib/postgresql-42.2.18.jar /srv/tomcat/webapps/ROOT/WEB-INF/bundles/postgresql-42.2.18.jar
# Change webapps ownership # Change webapps ownership
chown -R tomcat:tomcat /srv/tomcat/webapps chown -R tomcat:tomcat /srv/tomcat/webapps