Bump OpenDataKit to Ruby 2.4.10 on Alpine 3.12

This commit is contained in:
Disassembler 2020-10-22 22:59:58 +02:00
parent fe9928443f
commit a993e2f4ce
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
3 changed files with 9 additions and 9 deletions

View File

@ -1,5 +1,5 @@
{ {
"version": "2.0.5-200621", "version": "2.0.5-201021",
"meta": { "meta": {
"title": "OpenDataKit", "title": "OpenDataKit",
"desc-cs": "Sběr formulářových dat", "desc-cs": "Sběr formulářových dat",
@ -8,7 +8,7 @@
}, },
"containers": { "containers": {
"opendatakit": { "opendatakit": {
"image": "opendatakit_2.0.5-200621", "image": "opendatakit_2.0.5-201021",
"depends": [ "depends": [
"opendatakit-postgres" "opendatakit-postgres"
], ],
@ -19,7 +19,7 @@
} }
}, },
"opendatakit-build": { "opendatakit-build": {
"image": "opendatakit-build_0.3.5-200621", "image": "opendatakit-build_0.3.5-201021",
"depends": [ "depends": [
"opendatakit-postgres" "opendatakit-postgres"
], ],
@ -29,7 +29,7 @@
} }
}, },
"opendatakit-postgres": { "opendatakit-postgres": {
"image": "postgres_12.2.0-200621", "image": "postgres_12.4.0-201021",
"mounts": { "mounts": {
"opendatakit/postgres_data": "var/lib/postgresql" "opendatakit/postgres_data": "var/lib/postgresql"
} }

View File

@ -1,5 +1,5 @@
IMAGE opendatakit-build_0.3.5-200621 IMAGE opendatakit-build_0.3.5-201021
FROM alpine3.11-ruby2.4_2.4.9-200621 FROM alpine3.12-ruby2.4_2.4.10-201021
RUN EOF RUN EOF
# Install runtime dependencies # Install runtime dependencies

View File

@ -1,5 +1,5 @@
IMAGE opendatakit_2.0.5-200621 IMAGE opendatakit_2.0.5-201021
FROM alpine3.11-tomcat8.5_8.5.56-200621 FROM alpine3.12-tomcat8.5_8.5.59-201021
RUN EOF RUN EOF
# Download OpenDataKit # Download OpenDataKit
@ -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.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
# Change webapps ownership # Change webapps ownership
chown -R tomcat:tomcat /srv/tomcat/webapps chown -R tomcat:tomcat /srv/tomcat/webapps