From a993e2f4ce22257848dbf3a961d3c54b4c2a4ad3 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Thu, 22 Oct 2020 22:59:58 +0200
Subject: [PATCH] Bump OpenDataKit to Ruby 2.4.10 on Alpine 3.12

---
 lxc-apps/opendatakit/app                     | 8 ++++----
 lxc-apps/opendatakit/opendatakit-build.image | 4 ++--
 lxc-apps/opendatakit/opendatakit.image       | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lxc-apps/opendatakit/app b/lxc-apps/opendatakit/app
index 80c33a8..08fb6ed 100644
--- a/lxc-apps/opendatakit/app
+++ b/lxc-apps/opendatakit/app
@@ -1,5 +1,5 @@
 {
-    "version": "2.0.5-200621",
+    "version": "2.0.5-201021",
     "meta": {
         "title": "OpenDataKit",
         "desc-cs": "Sběr formulářových dat",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "opendatakit": {
-            "image": "opendatakit_2.0.5-200621",
+            "image": "opendatakit_2.0.5-201021",
             "depends": [
                 "opendatakit-postgres"
             ],
@@ -19,7 +19,7 @@
             }
         },
         "opendatakit-build": {
-            "image": "opendatakit-build_0.3.5-200621",
+            "image": "opendatakit-build_0.3.5-201021",
             "depends": [
                 "opendatakit-postgres"
             ],
@@ -29,7 +29,7 @@
             }
         },
         "opendatakit-postgres": {
-            "image": "postgres_12.2.0-200621",
+            "image": "postgres_12.4.0-201021",
             "mounts": {
                 "opendatakit/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/opendatakit/opendatakit-build.image b/lxc-apps/opendatakit/opendatakit-build.image
index 3d20d21..cba75ef 100644
--- a/lxc-apps/opendatakit/opendatakit-build.image
+++ b/lxc-apps/opendatakit/opendatakit-build.image
@@ -1,5 +1,5 @@
-IMAGE opendatakit-build_0.3.5-200621
-FROM alpine3.11-ruby2.4_2.4.9-200621
+IMAGE opendatakit-build_0.3.5-201021
+FROM alpine3.12-ruby2.4_2.4.10-201021
 
 RUN EOF
     # Install runtime dependencies
diff --git a/lxc-apps/opendatakit/opendatakit.image b/lxc-apps/opendatakit/opendatakit.image
index 3d05c12..9bd22b5 100644
--- a/lxc-apps/opendatakit/opendatakit.image
+++ b/lxc-apps/opendatakit/opendatakit.image
@@ -1,5 +1,5 @@
-IMAGE opendatakit_2.0.5-200621
-FROM alpine3.11-tomcat8.5_8.5.56-200621
+IMAGE opendatakit_2.0.5-201021
+FROM alpine3.12-tomcat8.5_8.5.59-201021
 
 RUN EOF
     # Download OpenDataKit
@@ -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.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
     chown -R tomcat:tomcat /srv/tomcat/webapps