Skip to content
This repository has been archived by the owner on Jan 25, 2023. It is now read-only.

Commit

Permalink
Merge pull request #280 from netlify/ruby-trusty
Browse files Browse the repository at this point in the history
Update to ruby 2.6.2
  • Loading branch information
bcomnes authored Mar 14, 2019
2 parents 30f0d5e + 0966907 commit e16ce1a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -242,10 +242,10 @@ ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/s

# Match this set latest Stable releases we can support on https://www.ruby-lang.org/en/downloads/
RUN /bin/bash -c "source ~/.rvm/scripts/rvm && \
rvm install 2.6.1 && rvm use 2.6.1 && gem install bundler && \
rvm install 2.5.3 && rvm use 2.5.3 && gem install bundler && \
rvm install 2.6.2 && rvm use 2.6.2 && gem install bundler && \
rvm install 2.5.4 && rvm use 2.5.4 && gem install bundler && \
rvm install 2.4.5 && rvm use 2.4.5 && gem install bundler && \
rvm use 2.6.1 --default && rvm cleanup all"
rvm use 2.6.2 --default && rvm cleanup all"

ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
USER root
Expand Down
4 changes: 2 additions & 2 deletions included_software.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ For instructions on how to run this image locally to test your build, please see
The specific patch versions included will depend on when the image was last built (except Ruby). It is highly suggested you depend only on minor versions, so that we can ensure the language has the latest updates (especially if security related).

* Ruby - `RUBY_VERSION`, `.ruby-version`
* 2.6.1 (default)
* 2.5.3
* 2.6.2 (default)
* 2.5.4
* 2.4.5
* Any version that `rvm` can install.
* Node.js - `NODE_VERSION`, `.nvmrc`, `.node-version`
Expand Down
2 changes: 1 addition & 1 deletion run-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fi
cd $NETLIFY_REPO_DIR

: ${NODE_VERSION="10"}
: ${RUBY_VERSION="2.6.1"}
: ${RUBY_VERSION="2.6.2"}
: ${YARN_VERSION="1.13.0"}
: ${PHP_VERSION="5.6"}
: ${GO_VERSION="1.12"}
Expand Down
2 changes: 1 addition & 1 deletion test-tools/test-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set -e

: ${NETLIFY_IMAGE="netlify/build"}
: ${NODE_VERSION="10"}
: ${RUBY_VERSION="2.6.1"}
: ${RUBY_VERSION="2.6.2"}
: ${YARN_VERSION="1.13.0"}
: ${NPM_VERSION=""}
: ${HUGO_VERSION="0.54"}
Expand Down

0 comments on commit e16ce1a

Please sign in to comment.