Skip to content

Commit 2a5ff22

Browse files
committed
Upgrade Slate sample to Slate 2.13.0
Closes gh-807
1 parent ee4616c commit 2a5ff22

File tree

5 files changed

+23
-13
lines changed

5 files changed

+23
-13
lines changed

samples/rest-notes-slate/slate/CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## Version 2.13.0
4+
5+
*April 22, 2022*
6+
7+
* __Drop support for ruby 2.5__
8+
* Bump rouge from 3.26.1 to 3.28.0
9+
* Formally support ruby 3.1
10+
* Bump nokogiri from 1.12.5 to 1.13.4
11+
* Build docker images for multiple architectures (e.g. `aarch64`)
12+
* Remove `VOLUME` declaration from Dockerfile (thanks @aemengo)
13+
14+
The security vulnerabilities reported against recent versions of nokogiri should not affect slate users with a regular setup.
15+
316
## Version 2.12.0
417

518
*November 04, 2021*

samples/rest-notes-slate/slate/Dockerfile

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ FROM ruby:2.6-slim
22

33
WORKDIR /srv/slate
44

5-
VOLUME /srv/slate/build
6-
VOLUME /srv/slate/source
7-
85
EXPOSE 4567
96

107
COPY Gemfile .
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ruby '>= 2.5'
1+
ruby '>= 2.6'
22
source 'https://rubygems.org'
33

44
# Middleman
@@ -8,6 +8,6 @@ gem 'middleman-autoprefixer', '~> 3.0'
88
gem 'middleman-sprockets', '~> 4.1'
99
gem 'rouge', '~> 3.21'
1010
gem 'redcarpet', '~> 3.5.0'
11-
gem 'nokogiri', '~> 1.12.1'
11+
gem 'nokogiri', '~> 1.13.3'
1212
gem 'sass'
1313
gem 'webrick'

samples/rest-notes-slate/slate/Gemfile.lock

+6-6
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ GEM
8080
middleman-syntax (3.2.0)
8181
middleman-core (>= 3.2)
8282
rouge (~> 3.2)
83-
mini_portile2 (2.6.1)
83+
mini_portile2 (2.8.0)
8484
minitest (5.14.4)
85-
nokogiri (1.12.5)
86-
mini_portile2 (~> 2.6.1)
85+
nokogiri (1.13.4)
86+
mini_portile2 (~> 2.8.0)
8787
racc (~> 1.4)
8888
padrino-helpers (0.15.1)
8989
i18n (>= 0.6.7, < 2)
@@ -93,14 +93,14 @@ GEM
9393
parallel (1.21.0)
9494
parslet (2.0.0)
9595
public_suffix (4.0.6)
96-
racc (1.5.2)
96+
racc (1.6.0)
9797
rack (2.2.3)
9898
rb-fsevent (0.11.0)
9999
rb-inotify (0.10.1)
100100
ffi (~> 1.0)
101101
redcarpet (3.5.1)
102102
rexml (3.2.5)
103-
rouge (3.26.1)
103+
rouge (3.28.0)
104104
sass (3.7.4)
105105
sass-listen (~> 4.0.0)
106106
sass-listen (4.0.0)
@@ -132,7 +132,7 @@ DEPENDENCIES
132132
middleman-autoprefixer (~> 3.0)
133133
middleman-sprockets (~> 4.1)
134134
middleman-syntax (~> 3.2)
135-
nokogiri (~> 1.12.1)
135+
nokogiri (~> 1.13.3)
136136
redcarpet (~> 3.5.0)
137137
rouge (~> 3.21)
138138
sass

samples/rest-notes-slate/slate/Vagrantfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Vagrant.configure(2) do |config|
2-
config.vm.box = "ubuntu/bionic64"
2+
config.vm.box = "ubuntu/focal64"
33
config.vm.network :forwarded_port, guest: 4567, host: 4567
44
config.vm.provider "virtualbox" do |vb|
55
vb.memory = "2048"
@@ -28,7 +28,7 @@ Vagrant.configure(2) do |config|
2828
echo "=============================================="
2929
echo "Installing app dependencies"
3030
cd /vagrant
31-
sudo gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)"
31+
sudo gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)"
3232
bundle config build.nokogiri --use-system-libraries
3333
bundle install
3434
SHELL

0 commit comments

Comments
 (0)