Sutty/panel
5
0
Fork 0
mirror of https://0xacab.org/sutty/sutty synced 2024-11-22 07:26:23 +00:00
Code Issues Projects Releases Wiki Activity

actualización de seguridad a ruby 2.6.6

Browse source
This commit is contained in:
f 2020-04-04 15:52:29 -03:00
parent 4e51ccd861
commit fa19f1ec96
No known key found for this signature in database
GPG key ID: 2AE5A13E321F953D
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.ruby-version
View file

@ -1 +1 @@
2.6.5 2.6.6

5
Dockerfile
View file

@ -9,7 +9,6 @@ MAINTAINER "f <f@sutty.nl>"
ARG RAILS_MASTER_KEY ARG RAILS_MASTER_KEY
# Un entorno base # Un entorno base
ENV NOKOGIRI_USE_SYSTEM_LIBRARIES=1
ENV SECRET_KEY_BASE solo_es_necesaria_para_correr_rake ENV SECRET_KEY_BASE solo_es_necesaria_para_correr_rake
ENV RAILS_ENV production ENV RAILS_ENV production
ENV RAILS_MASTER_KEY=$RAILS_MASTER_KEY 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 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 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://github.com/rubygems/rubygems/issues/2918
# https://gitlab.alpinelinux.org/alpine/aports/issues/10808 # https://gitlab.alpinelinux.org/alpine/aports/issues/10808
COPY ./rubygems-platform-musl.patch /tmp/ 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 RUN apk add --no-cache postgresql-libs libssh2 file rsync git jpegoptim vips
# Chequear que la versión de ruby sea la correcta # 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://github.com/rubygems/rubygems/issues/2918
# https://gitlab.alpinelinux.org/alpine/aports/issues/10808 # https://gitlab.alpinelinux.org/alpine/aports/issues/10808

2
Gemfile
View file

@ -15,7 +15,7 @@ git_source(:github) do |repo_name|
end end
# Cambiar en Dockerfile también # Cambiar en Dockerfile también
ruby '2.6.5' ruby '2.6.6'
gem 'dotenv-rails', require: 'dotenv/rails-now' gem 'dotenv-rails', require: 'dotenv/rails-now'

4
Gemfile.lock
View file

@ -266,7 +266,7 @@ GEM
pry (0.12.2) pry (0.12.2)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.9.0) method_source (~> 0.9.0)
public_suffix (4.0.3) public_suffix (4.0.4)
puma (4.3.3) puma (4.3.3)
nio4r (~> 2.0) nio4r (~> 2.0)
pundit (2.1.0) pundit (2.1.0)
@ -500,7 +500,7 @@ DEPENDENCIES
yaml_db! yaml_db!
RUBY VERSION RUBY VERSION
ruby 2.6.5p114 ruby 2.6.6p146
BUNDLED WITH BUNDLED WITH
2.1.4 2.1.4