Land #11184, update to Ruby 2.6.1
commit
760defd218
|
@ -1 +1 @@
|
|||
2.5.3
|
||||
2.6.1
|
||||
|
|
|
@ -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"'
|
||||
|
|
|
@ -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"
|
||||
|
@ -16,7 +16,7 @@ RUN apk add --no-cache \
|
|||
bison \
|
||||
build-base \
|
||||
ruby-dev \
|
||||
libressl-dev \
|
||||
openssl-dev \
|
||||
readline-dev \
|
||||
sqlite-dev \
|
||||
postgresql-dev \
|
||||
|
@ -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
|
||||
|
|
|
@ -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'
|
||||
|
|
Loading…
Reference in New Issue