X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/be1cfc020eb2d71d63bf5de7f8cfb1f7c08d8f03..8517d5da18ea743e5c932fd90b8a0324ab50f3d0:/cookbooks/stateofthemap/recipes/default.rb

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index 755500c36..c9eb827d5 100644
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -281,8 +281,15 @@ end
   end
 end
 
-gem_package "jekyll"
-gem_package "bundler"
+package %w[
+  ruby
+  ruby-dev
+  zlib1g-dev
+]
+
+gem_package "bundler" do
+  version "1.17.3"
+end
 
 %w[2016 2017 2018 2019 2020].each do |year|
   git "/srv/#{year}.stateofthemap.org" do
@@ -290,7 +297,7 @@ gem_package "bundler"
     repository "git://github.com/openstreetmap/stateofthemap-#{year}.git"
     user "root"
     group "root"
-    notifies :run, "execute[/srv/#{year}.stateofthemap.org]"
+    notifies :run, "execute[/srv/#{year}.stateofthemap.org/Gemfile]"
   end
 
   directory "/srv/#{year}.stateofthemap.org/_site" do
@@ -299,9 +306,28 @@ gem_package "bundler"
     group "nogroup"
   end
 
+  # Workaround https://github.com/jekyll/jekyll/issues/7804
+  # by creating a .jekyll-cache folder
+  directory "/srv/#{year}.stateofthemap.org/.jekyll-cache" do
+    mode 0o755
+    owner "nobody"
+    group "nogroup"
+  end
+
+  execute "/srv/#{year}.stateofthemap.org/Gemfile" do
+    action :nothing
+    command "bundle install --deployment"
+    cwd "/srv/#{year}.stateofthemap.org"
+    user "root"
+    group "root"
+    notifies :run, "execute[/srv/#{year}.stateofthemap.org]"
+    # Workaround until 2019 until merged https://github.com/openstreetmap/stateofthemap-2019/pull/46
+    only_if { ::File.exist?("/srv/#{year}.stateofthemap.org/Gemfile") }
+  end
+
   execute "/srv/#{year}.stateofthemap.org" do
     action :nothing
-    command "jekyll build --trace"
+    command "bundle exec jekyll build --trace --baseurl=https://#{year}.stateofthemap.org"
     cwd "/srv/#{year}.stateofthemap.org"
     user "nobody"
     group "nogroup"