Skip to content

Commit

Permalink
Ruby version reset to address website build errors (apache#1477)
Browse files Browse the repository at this point in the history
* Reset Ruby version to 2.4.1

* Update build Dockerfile

* Update README setup section
  • Loading branch information
lucperkins authored and merlimat committed Mar 30, 2018
1 parent 5f1aed2 commit 3cc89d2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64

## Website build dependencies

# Install Ruby-2.3.1
# Install Ruby-2.4.1
RUN apt-get install -y
RUN gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
(curl -sSL https://get.rvm.io | bash -s stable)
ENV PATH "$PATH:/usr/local/rvm/bin"
RUN rvm install 2.3.1
RUN rvm install 2.4.1

# Install PIP and PDoc
RUN wget https://bootstrap.pypa.io/get-pip.py && python get-pip.py
Expand Down
2 changes: 1 addition & 1 deletion site/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
#

source 'https://rubygems.org'
ruby '2.3.1'
ruby '2.4.1'

gem 'jekyll', '3.7.3'
2 changes: 1 addition & 1 deletion site/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ DEPENDENCIES
jekyll (= 3.7.3)

RUBY VERSION
ruby 2.3.1p112
ruby 2.4.1p111

BUNDLED WITH
1.16.1
2 changes: 1 addition & 1 deletion site/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ This website is built using a wide range of tools. The most important among them

> **Note**: at the moment, running the site locally *may* work on Linux but the site setup has been built with MacOS in mind. We will provide better cross-platform support in the near future.
To build and run the site locally, you need to have Ruby 2.3.1 installed and set as the Ruby version here in the `site` directory. You can install and set the Ruby version using [rvm](https://rvm.io):
To build and run the site locally, you need to have Ruby 2.4.1 installed and set as the Ruby version here in the `site` directory. You can install and set the Ruby version using [rvm](https://rvm.io):

```bash
$ cd site
Expand Down

0 comments on commit 3cc89d2

Please sign in to comment.