Skip to content

Commit

Permalink
Upgrade to ruby 2.3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
CloCkWeRX committed Jan 14, 2017
1 parent 1684c10 commit 18c5846
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
@@ -1 +1 @@
2.2.5
2.3.3
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -2,7 +2,7 @@ language: ruby
# If you don't specify a version, Travis CI will use MRI 1.9.3 as the default.
# http://docs.travis-ci.com/user/languages/ruby/
rvm:
- 2.2.5
- 2.3.3
services:
- mongodb
- elasticsearch
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -2,7 +2,7 @@
# Image name: openfarm-webapp
#

FROM ruby:2.2.5
FROM ruby:2.3.3
MAINTAINER https://github.com/FarmBot/OpenFarm

ENV PHANTOM_JS_VERSION 1.9.8
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '2.2.5'
ruby '2.3.3'

gem 'bundler', '>= 1.7.0'

Expand Down
3 changes: 0 additions & 3 deletions Gemfile.lock
Expand Up @@ -549,8 +549,5 @@ DEPENDENCIES
vcr
webmock

RUBY VERSION
ruby 2.2.5p319

BUNDLED WITH
1.13.6
6 changes: 3 additions & 3 deletions scripts/bootstrap.sh
Expand Up @@ -18,14 +18,14 @@ echo "--- INSTALLING RVM ---"

gpg --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys D39DC0E3

curl -sSL https://get.rvm.io | bash -s stable --quiet-curl --ruby=2.2.5
curl -sSL https://get.rvm.io | bash -s stable --quiet-curl --ruby=2.3.3

echo "--- INSTALLING RUBY 2.2.5 ---"
echo "--- INSTALLING RUBY 2.3.3 ---"

source /home/vagrant/.rvm/scripts/rvm

rvm reload
rvm --default use 2.2.5
rvm --default use 2.3.3

echo "--- INSTALLING ELASTICSEARCH ---"

Expand Down
2 changes: 1 addition & 1 deletion scripts/up.sh
Expand Up @@ -4,7 +4,7 @@
echo "--- STARTING UP SERVER ---"

sudo service elasticsearch start
#PATH=~/home/vagrant/.rvm/gems/ruby-2.2.5@openfarm/bin/:$PATH
#PATH=~/home/vagrant/.rvm/gems/ruby-2.3.3@openfarm/bin/:$PATH
source /home/vagrant/.rvm/scripts/rvm

rvm reload
Expand Down

0 comments on commit 18c5846

Please sign in to comment.