From ef52c066d2296af98d9fb2861e81020662d2659b Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sun, 22 Mar 2020 12:17:13 +0100
Subject: [PATCH] Bump CrisisCleanup to Alpine 3.10 + Node.js 10

---
 lxc-apps/ckan/ckan-datapusher.image                        | 1 +
 lxc-apps/crisiscleanup/image                               | 6 +++++-
 lxc-apps/frontlinesms/image                                | 1 +
 lxc-apps/openmapkit/image                                  | 1 +
 lxc-shared/{alpine3.8-ruby2.4 => alpine3.10-ruby2.4}/image | 4 ++--
 5 files changed, 10 insertions(+), 3 deletions(-)
 rename lxc-shared/{alpine3.8-ruby2.4 => alpine3.10-ruby2.4}/image (92%)

diff --git a/lxc-apps/ckan/ckan-datapusher.image b/lxc-apps/ckan/ckan-datapusher.image
index 6e58a7c..9cd95c2 100644
--- a/lxc-apps/ckan/ckan-datapusher.image
+++ b/lxc-apps/ckan/ckan-datapusher.image
@@ -1,5 +1,6 @@
 IMAGE ckan-datapusher_0.0.16-200313
 FROM alpine3.10-python2.7_2.7.16-200313
+# Alpine 3.11 discontinued uwsgi-python2 module
 
 RUN EOF
     # Install runtime dependencies
diff --git a/lxc-apps/crisiscleanup/image b/lxc-apps/crisiscleanup/image
index 4d375df..14da1f1 100644
--- a/lxc-apps/crisiscleanup/image
+++ b/lxc-apps/crisiscleanup/image
@@ -1,5 +1,6 @@
 IMAGE crisiscleanup_2.2.0-200313
-FROM alpine3.8-ruby2.4_2.4.9-200313
+FROM alpine3.10-ruby2.4_2.4.9-200313
+# yarn dependencies installation fails on nodejs>10
 
 ENV RAILS_ENV production
 
@@ -17,6 +18,9 @@ RUN EOF
     sed -i 's/ruby "2\.4\.4"/ruby "2.4.9"/' /srv/crisiscleanup/Gemfile
     gem install bundler:1.16.6
 
+    # Hackfix nodejs version requirement
+    sed -i 's/8\.x/10.x/' /srv/crisiscleanup/package.json
+
     # Install Ruby and NodeJS dependencies
     cd /srv/crisiscleanup
     bundle config build.nokogiri --use-system-libraries
diff --git a/lxc-apps/frontlinesms/image b/lxc-apps/frontlinesms/image
index a936455..ba442dd 100644
--- a/lxc-apps/frontlinesms/image
+++ b/lxc-apps/frontlinesms/image
@@ -1,5 +1,6 @@
 IMAGE frontlinesms_2.6.5-200313
 FROM alpine3.8-java8_8.222.10-200313
+# HTTP connection accept fails on Java 8.242
 
 RUN EOF
     # Install runtime dependencies
diff --git a/lxc-apps/openmapkit/image b/lxc-apps/openmapkit/image
index f1e3bc8..6d7830a 100644
--- a/lxc-apps/openmapkit/image
+++ b/lxc-apps/openmapkit/image
@@ -1,5 +1,6 @@
 IMAGE openmapkit_0.12.0-200313
 FROM alpine3.10-nodejs10_10.19.0-200313
+# libxmljs installation fails on nodejs>10
 
 RUN EOF
     # Install runtime dependencies
diff --git a/lxc-shared/alpine3.8-ruby2.4/image b/lxc-shared/alpine3.10-ruby2.4/image
similarity index 92%
rename from lxc-shared/alpine3.8-ruby2.4/image
rename to lxc-shared/alpine3.10-ruby2.4/image
index 535b50f..a02e65f 100644
--- a/lxc-shared/alpine3.8-ruby2.4/image
+++ b/lxc-shared/alpine3.10-ruby2.4/image
@@ -1,5 +1,5 @@
-IMAGE alpine3.8-ruby2.4_2.4.9-200313
-FROM alpine3.8_3.8.5-200313
+IMAGE alpine3.10-ruby2.4_2.4.9-200313
+FROM alpine3.10_3.10.4-200313
 
 RUN EOF
     # Install Ruby runtime dependencies