From 2a5ff22494c72e7f240a676540ae1b98a6a213df Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Mon, 16 May 2022 17:23:44 +0100
Subject: [PATCH] Upgrade Slate sample to Slate 2.13.0

Closes gh-807
---
 samples/rest-notes-slate/slate/CHANGELOG.md | 13 +++++++++++++
 samples/rest-notes-slate/slate/Dockerfile   |  3 ---
 samples/rest-notes-slate/slate/Gemfile      |  4 ++--
 samples/rest-notes-slate/slate/Gemfile.lock | 12 ++++++------
 samples/rest-notes-slate/slate/Vagrantfile  |  4 ++--
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/samples/rest-notes-slate/slate/CHANGELOG.md b/samples/rest-notes-slate/slate/CHANGELOG.md
index 568509d6..6e7e39df 100644
--- a/samples/rest-notes-slate/slate/CHANGELOG.md
+++ b/samples/rest-notes-slate/slate/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## Version 2.13.0
+
+*April 22, 2022*
+
+* __Drop support for ruby 2.5__
+* Bump rouge from 3.26.1 to 3.28.0
+* Formally support ruby 3.1
+* Bump nokogiri from 1.12.5 to 1.13.4
+* Build docker images for multiple architectures (e.g. `aarch64`)
+* Remove `VOLUME` declaration from Dockerfile (thanks @aemengo)
+
+The security vulnerabilities reported against recent versions of nokogiri should not affect slate users with a regular setup.
+
 ## Version 2.12.0
 
 *November 04, 2021*
diff --git a/samples/rest-notes-slate/slate/Dockerfile b/samples/rest-notes-slate/slate/Dockerfile
index 504da654..077ef3b1 100644
--- a/samples/rest-notes-slate/slate/Dockerfile
+++ b/samples/rest-notes-slate/slate/Dockerfile
@@ -2,9 +2,6 @@ FROM ruby:2.6-slim
 
 WORKDIR /srv/slate
 
-VOLUME /srv/slate/build
-VOLUME /srv/slate/source
-
 EXPOSE 4567
 
 COPY Gemfile .
diff --git a/samples/rest-notes-slate/slate/Gemfile b/samples/rest-notes-slate/slate/Gemfile
index 3b8c130d..7604fd42 100644
--- a/samples/rest-notes-slate/slate/Gemfile
+++ b/samples/rest-notes-slate/slate/Gemfile
@@ -1,4 +1,4 @@
-ruby '>= 2.5'
+ruby '>= 2.6'
 source 'https://rubygems.org'
 
 # Middleman
@@ -8,6 +8,6 @@ gem 'middleman-autoprefixer', '~> 3.0'
 gem 'middleman-sprockets', '~> 4.1'
 gem 'rouge', '~> 3.21'
 gem 'redcarpet', '~> 3.5.0'
-gem 'nokogiri', '~> 1.12.1'
+gem 'nokogiri', '~> 1.13.3'
 gem 'sass'
 gem 'webrick'
diff --git a/samples/rest-notes-slate/slate/Gemfile.lock b/samples/rest-notes-slate/slate/Gemfile.lock
index 18702217..bd60f7f6 100644
--- a/samples/rest-notes-slate/slate/Gemfile.lock
+++ b/samples/rest-notes-slate/slate/Gemfile.lock
@@ -80,10 +80,10 @@ GEM
     middleman-syntax (3.2.0)
       middleman-core (>= 3.2)
       rouge (~> 3.2)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.0)
     minitest (5.14.4)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.4)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     padrino-helpers (0.15.1)
       i18n (>= 0.6.7, < 2)
@@ -93,14 +93,14 @@ GEM
     parallel (1.21.0)
     parslet (2.0.0)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
     rexml (3.2.5)
-    rouge (3.26.1)
+    rouge (3.28.0)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -132,7 +132,7 @@ DEPENDENCIES
   middleman-autoprefixer (~> 3.0)
   middleman-sprockets (~> 4.1)
   middleman-syntax (~> 3.2)
-  nokogiri (~> 1.12.1)
+  nokogiri (~> 1.13.3)
   redcarpet (~> 3.5.0)
   rouge (~> 3.21)
   sass
diff --git a/samples/rest-notes-slate/slate/Vagrantfile b/samples/rest-notes-slate/slate/Vagrantfile
index 200839d0..769b8a5b 100644
--- a/samples/rest-notes-slate/slate/Vagrantfile
+++ b/samples/rest-notes-slate/slate/Vagrantfile
@@ -1,5 +1,5 @@
 Vagrant.configure(2) do |config|
-  config.vm.box = "ubuntu/bionic64"
+  config.vm.box = "ubuntu/focal64"
   config.vm.network :forwarded_port, guest: 4567, host: 4567
   config.vm.provider "virtualbox" do |vb|
     vb.memory = "2048"
@@ -28,7 +28,7 @@ Vagrant.configure(2) do |config|
       echo "=============================================="
       echo "Installing app dependencies"
       cd /vagrant
-      sudo gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)" 
+      sudo gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)"
       bundle config build.nokogiri --use-system-libraries
       bundle install
     SHELL