Skip to content

Commit

Permalink
Merge pull request #261 from epimorphics/issue/ruby-rails-upgrade
Browse files Browse the repository at this point in the history
Issue/ruby rails upgrade
  • Loading branch information
bogdanadrianmarc authored Nov 21, 2024
2 parents c32d57d + 50ef934 commit 4126957
Show file tree
Hide file tree
Showing 10 changed files with 365 additions and 270 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.8
3.3.5
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN apk add --update \
nodejs \
tzdata \
&& rm -rf /var/cache/apk/* \
&& gem update --system 3.2.3 \
&& gem update --system \
&& gem install bundler:$BUNDLER_VERSION \
&& bundle config --global frozen 1

Expand Down
34 changes: 16 additions & 18 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

source 'https://rubygems.org'

gem 'execjs', '< 2.8.0'
gem 'execjs'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '< 6.0.0'
gem 'rails'

# Use Puma as the app server
gem 'puma'
Expand All @@ -14,14 +14,13 @@ gem 'puma'
gem 'sass-rails'

# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
gem 'uglifier'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby
gem 'libv8-node', '>= 16.10.0.0'
gem 'libv8-node'

# lock down the version of rubygems-update to avoid issues with rubygems
gem 'rubygems-update', '~> 3.4', '>= 3.4.22'
gem 'rubygems-update'

gem 'jbuilder'
gem 'jquery-rails'
Expand Down Expand Up @@ -68,24 +67,23 @@ gem 'faraday_middleware'
gem 'font-awesome-rails'
gem 'get_process_mem'
gem 'jquery-ui-rails'
gem 'prometheus-client', '~> 4.0'
gem 'sentry-rails', '~> 5.2'
gem 'prometheus-client'
gem 'sentry-rails'
gem 'yajl-ruby', require: 'yajl'

gem 'puma-metrics'

# TODO: In production you want to set this to the gem from the epimorphics package repo
source 'https://rubygems.pkg.github.com/epimorphics' do
gem 'data_services_api'
gem 'json_rails_logger'
gem 'lr_common_styles'
end

# rubocop:disable Layout/LineLength
# TODO: While running the rails app locally for testing you can set gems to your local path
# ! These "local" paths do not work with a docker image - use the repo instead
# gem 'data_services_api', '~> 1.3.3', path: '~/Epimorphics/shared/data_services_api/'
# gem 'json_rails_logger', '~>1.0.0', path: '~/Epimorphics/shared/json-rails-logger/'
# gem 'lr_common_styles', '~> 1.9.0', path: '~/Epimorphics/clients/land-registry/projects/lr_common_styles/'
# gem 'data_services_api', path: '~/Epimorphics/shared/data_services_api'
# gem 'json_rails_logger', path: '~/Epimorphics/shared/json-rails-logger'
# gem 'lr_common_styles', path: '~/Epimorphics/clients/land-registry/projects/lr_common_styles'
# rubocop:enable Layout/LineLength

# TODO: In production you want to set this to the gem from the epimorphics package repo
source 'https://rubygems.pkg.github.com/epimorphics' do
gem 'data_services_api', '~> 1.3.3'
gem 'json_rails_logger', '~>1.0.0'
gem 'lr_common_styles', '~> 2.0' # set as this version as bundler breaks otherwise
end
Loading

0 comments on commit 4126957

Please sign in to comment.