From fa19f1ec9641417a9157329de69f1492d58c82bc Mon Sep 17 00:00:00 2001 From: f Date: Sat, 4 Apr 2020 15:52:29 -0300 Subject: [PATCH] =?UTF-8?q?actualizaci=C3=B3n=20de=20seguridad=20a=20ruby?= =?UTF-8?q?=202.6.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ruby-version | 2 +- Dockerfile | 5 +++-- Gemfile | 2 +- Gemfile.lock | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.ruby-version b/.ruby-version index 57cf282..338a5b5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.5 +2.6.6 diff --git a/Dockerfile b/Dockerfile index 634c264..8a5978b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,6 @@ MAINTAINER "f " ARG RAILS_MASTER_KEY # Un entorno base -ENV NOKOGIRI_USE_SYSTEM_LIBRARIES=1 ENV SECRET_KEY_BASE solo_es_necesaria_para_correr_rake ENV RAILS_ENV production ENV RAILS_MASTER_KEY=$RAILS_MASTER_KEY @@ -17,6 +16,8 @@ ENV RAILS_MASTER_KEY=$RAILS_MASTER_KEY RUN apk add --no-cache libxslt libxml2 tzdata ruby ruby-bundler ruby-json ruby-bigdecimal ruby-rake RUN apk add --no-cache postgresql-libs git yarn brotli libssh2 python +RUN test "2.6.6" = `ruby -e 'puts RUBY_VERSION'` + # https://github.com/rubygems/rubygems/issues/2918 # https://gitlab.alpinelinux.org/alpine/aports/issues/10808 COPY ./rubygems-platform-musl.patch /tmp/ @@ -78,7 +79,7 @@ RUN apk add --no-cache libxslt libxml2 tzdata ruby ruby-bundler ruby-json ruby-b RUN apk add --no-cache postgresql-libs libssh2 file rsync git jpegoptim vips # Chequear que la versión de ruby sea la correcta -RUN test "2.6.5" = `ruby -e 'puts RUBY_VERSION'` +RUN test "2.6.6" = `ruby -e 'puts RUBY_VERSION'` # https://github.com/rubygems/rubygems/issues/2918 # https://gitlab.alpinelinux.org/alpine/aports/issues/10808 diff --git a/Gemfile b/Gemfile index fbde970..c70e757 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ git_source(:github) do |repo_name| end # Cambiar en Dockerfile también -ruby '2.6.5' +ruby '2.6.6' gem 'dotenv-rails', require: 'dotenv/rails-now' diff --git a/Gemfile.lock b/Gemfile.lock index 5e41526..39917b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -266,7 +266,7 @@ GEM pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - public_suffix (4.0.3) + public_suffix (4.0.4) puma (4.3.3) nio4r (~> 2.0) pundit (2.1.0) @@ -500,7 +500,7 @@ DEPENDENCIES yaml_db! RUBY VERSION - ruby 2.6.5p114 + ruby 2.6.6p146 BUNDLED WITH 2.1.4