From f68107781806f3d60d4c4e29b463fcc18e20d6f4 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 28 Jan 2018 02:47:09 -0600 Subject: [PATCH 1/2] update dockerfile to include newer --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f6c0007042..86d8ac9547 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.4.2-alpine +FROM ruby:2.4.3-alpine3.7 LABEL maintainer="Rapid7" ARG BUNDLER_ARGS="--jobs=8 --without development test coverage" @@ -20,6 +20,8 @@ RUN apk update && \ nmap-scripts \ nmap-nselibs \ postgresql-libs \ + python \ + python3 \ ncurses \ libcap \ && apk add --virtual .ruby-builddeps \ @@ -27,7 +29,7 @@ RUN apk update && \ bison \ build-base \ ruby-dev \ - openssl-dev \ + libressl-dev \ readline-dev \ sqlite-dev \ postgresql-dev \ From 0408dd89a43d6abb91efe0a1a75b6e1792374291 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 28 Jan 2018 03:09:34 -0600 Subject: [PATCH 2/2] bump travis and rvm ruby versions --- .ruby-version | 2 +- .travis.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ruby-version b/.ruby-version index 8e8299dcc0..35cee72dcb 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.4.2 +2.4.3 diff --git a/.travis.yml b/.travis.yml index 5d4166a1b4..27c20be422 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ addons: language: ruby rvm: - '2.2' - - '2.3.5' - - '2.4.2' + - '2.3.6' + - '2.4.3' env: - CMD='bundle exec rake rspec-rerun:spec SPEC_OPTS="--tag content"'