Land #11184, update to Ruby 2.6.1

GSoC/Meterpreter_Web_Console
Brent Cook 2019-02-19 21:06:40 -06:00
commit 760defd218
No known key found for this signature in database
GPG Key ID: 1FFAA0B24B708F96
4 changed files with 16 additions and 4 deletions

View File

@ -1 +1 @@
2.5.3 2.6.1

View File

@ -14,6 +14,7 @@ rvm:
- '2.3.8' - '2.3.8'
- '2.4.5' - '2.4.5'
- '2.5.3' - '2.5.3'
- '2.6.1'
env: env:
- CMD='bundle exec rake rspec-rerun:spec SPEC_OPTS="--tag content"' - CMD='bundle exec rake rspec-rerun:spec SPEC_OPTS="--tag content"'

View File

@ -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" LABEL maintainer="Rapid7"
ARG BUNDLER_ARGS="--jobs=8 --without development test coverage" ARG BUNDLER_ARGS="--jobs=8 --without development test coverage"
@ -16,7 +16,7 @@ RUN apk add --no-cache \
bison \ bison \
build-base \ build-base \
ruby-dev \ ruby-dev \
libressl-dev \ openssl-dev \
readline-dev \ readline-dev \
sqlite-dev \ sqlite-dev \
postgresql-dev \ postgresql-dev \
@ -37,7 +37,7 @@ RUN apk add --no-cache \
&& chmod -R a+r /usr/local/bundle && chmod -R a+r /usr/local/bundle
FROM ruby:2.5.3-alpine3.7 FROM ruby:2.6.1-alpine3.9
LABEL maintainer="Rapid7" LABEL maintainer="Rapid7"
ENV APP_HOME=/usr/src/metasploit-framework ENV APP_HOME=/usr/src/metasploit-framework

View File

@ -13,6 +13,17 @@
# Include backported features for older versions of Ruby # Include backported features for older versions of Ruby
require 'backports' 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 # The framework-core depends on Rex
require 'rex' require 'rex'
require 'rex/ui' require 'rex/ui'