Skip to content

Commit

Permalink
Land #11184, update to Ruby 2.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
busterb committed Feb 20, 2019
2 parents 880e597 + c68c44c commit 760defd
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
@@ -1 +1 @@
2.5.3
2.6.1
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -14,6 +14,7 @@ rvm:
- '2.3.8'
- '2.4.5'
- '2.5.3'
- '2.6.1'

env:
- CMD='bundle exec rake rspec-rerun:spec SPEC_OPTS="--tag content"'
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
@@ -1,4 +1,4 @@
FROM ruby:2.5.3-alpine3.7 AS builder
FROM ruby:2.6.1-alpine3.9 AS builder
LABEL maintainer="Rapid7"

ARG BUNDLER_ARGS="--jobs=8 --without development test coverage"
Expand All @@ -16,7 +16,7 @@ RUN apk add --no-cache \
bison \
build-base \
ruby-dev \
libressl-dev \
openssl-dev \
readline-dev \
sqlite-dev \
postgresql-dev \
Expand All @@ -37,7 +37,7 @@ RUN apk add --no-cache \
&& chmod -R a+r /usr/local/bundle


FROM ruby:2.5.3-alpine3.7
FROM ruby:2.6.1-alpine3.9
LABEL maintainer="Rapid7"

ENV APP_HOME=/usr/src/metasploit-framework
Expand Down
11 changes: 11 additions & 0 deletions lib/msf/core.rb
Expand Up @@ -13,6 +13,17 @@
# Include backported features for older versions of Ruby
require 'backports'

# Remove bigdecimal warning - start
# https://github.com/ruby/bigdecimal/pull/115
# https://github.com/rapid7/metasploit-framework/pull/11184#issuecomment-461971266
# TODO: remove when upgrading from rails 4.x
require 'bigdecimal'

def BigDecimal.new(*args, **kwargs)
BigDecimal(*args, **kwargs)
end
# Remove bigdecimal warning - end

# The framework-core depends on Rex
require 'rex'
require 'rex/ui'
Expand Down

0 comments on commit 760defd

Please sign in to comment.