Merge pull request #169 from OpenCSPM/build

security updates
OpenCSPM · May 10, 2021 · d88a990 · d88a990
2 parents 2d734b9 + 1d88423
commit d88a990
Show file tree

Hide file tree

Showing 8 changed files with 1,042 additions and 960 deletions.
diff --git a/docker/.dockerdev/Dockerfile b/docker/.dockerdev/Dockerfile
@@ -1,9 +1,9 @@
-ARG RUBY_VERSION=2.6.6
+ARG RUBY_VERSION=2.7.3
 FROM ruby:$RUBY_VERSION-slim-buster
 
 ARG PG_MAJOR=13
 ARG NODE_MAJOR=12
-ARG BUNDLER_VERSION=2.0.2
+ARG BUNDLER_VERSION=2.1.4
 ARG YARN_VERSION=1.22.5
 
 # Common dependencies

diff --git a/docker/.dockerdev/Dockerfile.development b/docker/.dockerdev/Dockerfile.development
@@ -1,9 +1,9 @@
-ARG RUBY_VERSION=2.6.6
+ARG RUBY_VERSION=2.7.3
 FROM ruby:$RUBY_VERSION-slim-buster
 
 ARG PG_MAJOR=13
 ARG NODE_MAJOR=12
-ARG BUNDLER_VERSION=2.0.2
+ARG BUNDLER_VERSION=2.1.4
 ARG YARN_VERSION=1.22.5
 
 # Common dependencies

diff --git a/docker/Gemfile b/docker/Gemfile
@@ -1,9 +1,9 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.6.6'
+ruby '2.7.3'
 
-gem 'rails', '~> 6.0.3', '>= 6.0.3.5'
+gem 'rails', '~> 6.1.3', '>= 6.1.3'
 gem 'pg', '>= 0.18', '< 2.0'
 gem 'puma', '~> 4.1'
 gem 'bootsnap', '>= 1.4.2', require: false