docs: Fix required ruby-version (#675)
* fix required ruby-version
Signed-off-by: mkontani <itoama@live.jp>
* add a changelog entry
Signed-off-by: mkontani <itoama@live.jp>
Co-authored-by: Joel Speed <Joel.speed@hotmail.co.uk>
commitdd361389659e5da81f1ca51051966d4fe15260ab
authormkontani <itoama@live.jp>
dateMon 13 Jul 2020, 00:09 (6 years ago)
parent1871614
CHANGELOG.md+1
@@ -8,6 +8,7 @@
88
99## Changes since v6.0.0
1010
11+- [#675](https://github.com/oauth2-proxy/oauth2-proxy/pull/675) Fix required ruby version and deprecated option for building docs (@mkontani)
1112- [#669](https://github.com/oauth2-proxy/oauth2-proxy/pull/669) Reduce docker context to improve build times (@JoelSpeed)
1213- [#668](https://github.com/oauth2-proxy/oauth2-proxy/pull/668) Use req.Host in --force-https when req.URL.Host is empty (@zucaritask)
1314- [#660](https://github.com/oauth2-proxy/oauth2-proxy/pull/660) Use builder pattern to simplify requests to external endpoints (@JoelSpeed)
docs/Makefile+3−2
@@ -1,7 +1,7 @@
11.PHONY: ruby
22ruby:
33 @ if [ ! $$(which ruby) ]; then \
4− echo "Please install ruby version 2.1.0 or higher"; \
4+ echo "Please install ruby version 2.5.0 or higher"; \
55 fi
66
77.PHONY: bundle
@@ -11,7 +11,8 @@ bundle: ruby
1111 fi
1212
1313vendor/bundle: bundle
14− bundle install --path vendor/bundle
14+ bundle config set --local path 'vendor/bundle'
15+ bundle install
1516
1617.PHONY: serve
1718serve: vendor/bundle
docs/README.md+1−1
@@ -9,5 +9,5 @@ When making changes to this docs site, please test your changes locally:
99docs$ make serve
1010```
1111
12−To run the docs site locally you will need Ruby at version 2.1.0 or
12+To run the docs site locally you will need Ruby at version 2.5.0 or
1313higher and `bundle` (`gem install bundler` if you already have Ruby).