Merge pull request #165 from CDLUC3/rails7

Rails7 migration changes
CDLUC3 · Nov 19, 2024 · 9e85dc3 · 9e85dc3
2 parents b22c306 + c63f9d4
commit 9e85dc3
Show file tree

Hide file tree

Showing 36 changed files with 688 additions and 324 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -31,7 +31,7 @@ COPY . .
 RUN bundle install 
 
 # Build a discardable master.key and credentials.yml.enc file for docker deployment
-RUN EDITOR=nano rails credentials:edit
+RUN EDITOR=nano bundle exec rails credentials:edit
 
 ENV SSM_SKIP_RESOLUTION=Y
 RUN bundle exec rails assets:precompile && \

diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ gem 'activeresource'
 gem 'json'
 gem 'multi_json'
 gem 'mysql2'
-gem 'rails', '~> 6.0'
+gem 'rails', '~> 7.2'
 
 gem 'aws-sdk-ec2'
 gem 'aws-sdk-ssm'
@@ -29,6 +29,7 @@ gem 'puma'
 gem 'rack-cache'
 gem 'rest-client'
 gem 'sprockets'
+gem 'sprockets-rails'
 gem 'thin'
 gem 'uc3-ssm', git: 'https://github.com/CDLUC3/uc3-ssm.git', tag: '1.0.3'
 gem 'uglifier'