From e3555105753a3e372184031d780c0e4394bb5a9b Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sat, 21 Dec 2019 14:26:47 +0100
Subject: [PATCH] Fix required bundler version for ruby app

---
 lxc-apps/crisiscleanup/lxcfile                 | 3 ++-
 lxc-apps/decidim/lxcfile                       | 1 +
 lxc-apps/opendatakit/opendatakit-build.lxcfile | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lxc-apps/crisiscleanup/lxcfile b/lxc-apps/crisiscleanup/lxcfile
index 7a2239f..cb20a66 100644
--- a/lxc-apps/crisiscleanup/lxcfile
+++ b/lxc-apps/crisiscleanup/lxcfile
@@ -14,7 +14,8 @@ RUN EOF
     git clone --depth 1 https://github.com/CrisisCleanup/crisiscleanup /srv/crisiscleanup
 
     # Hackfix ruby dependency versions
-    sed -i 's/2\.4\.4/2.4.5/' /srv/crisiscleanup/Gemfile
+    sed -i 's/ruby "2\.4\.4"/ruby "2.4.5"/' /srv/crisiscleanup/Gemfile
+    gem install bundler:1.16.6
 
     # Install Ruby and NodeJS dependencies
     cd /srv/crisiscleanup
diff --git a/lxc-apps/decidim/lxcfile b/lxc-apps/decidim/lxcfile
index 3c12b5a..2f5c557 100644
--- a/lxc-apps/decidim/lxcfile
+++ b/lxc-apps/decidim/lxcfile
@@ -49,6 +49,7 @@ RUN EOF
     rm -f /etc/nginx/*.default
 
     # Install Decidim
+    gem install bundler:1.17.3
     bundle config build.nokogiri --use-system-libraries
     gem install decidim
     cd /srv
diff --git a/lxc-apps/opendatakit/opendatakit-build.lxcfile b/lxc-apps/opendatakit/opendatakit-build.lxcfile
index a2f53ff..279cefd 100644
--- a/lxc-apps/opendatakit/opendatakit-build.lxcfile
+++ b/lxc-apps/opendatakit/opendatakit-build.lxcfile
@@ -13,6 +13,7 @@ RUN EOF
 
     # Install Ruby dependencies
     cd /srv/opendatakit-build
+    gem install bundler:1.13.6
     bundle install --without test
     rake deploy:build