From b1982303ff3abb0b153c64f1bbdd7ad9c15f6609 Mon Sep 17 00:00:00 2001 From: thatguyinabeanie Date: Sat, 14 Dec 2024 21:10:28 -0600 Subject: [PATCH 1/6] save --- .ruby-version | 2 +- Dockerfile.dev | 2 +- Dockerfile.prod | 2 +- Gemfile | 2 +- Gemfile.lock | 146 ++++++++++++++++++++++----------------------- docker-compose.yml | 1 - 6 files changed, 77 insertions(+), 78 deletions(-) diff --git a/.ruby-version b/.ruby-version index fa7adc7ac..eedb52bac 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.5 +3.3.6 \ No newline at end of file diff --git a/Dockerfile.dev b/Dockerfile.dev index e15fd25e6..3313c7571 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,7 +1,7 @@ ## ## BASE IMAGE WITH ASDF AND RUBY ## -FROM mcr.microsoft.com/devcontainers/ruby:3.3-bookworm AS base-image +FROM mcr.microsoft.com/devcontainers/ruby:3-bookworm AS base-image WORKDIR /battle-stadium COPY .ruby-version . diff --git a/Dockerfile.prod b/Dockerfile.prod index ebb35663d..ef12c7c39 100644 --- a/Dockerfile.prod +++ b/Dockerfile.prod @@ -1,5 +1,5 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile -ARG RUBY_VERSION=3.3.5 +ARG RUBY_VERSION=3.3.6 FROM library/ruby:$RUBY_VERSION-slim AS base # Rails app lives here diff --git a/Gemfile b/Gemfile index 69d48019e..d1b8879a5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Specify your Ruby version -ruby "3.3.5" +ruby "~> 3" # Rails framework gem "active_model_serializers", "~> 0" diff --git a/Gemfile.lock b/Gemfile.lock index 3f4f3d220..f67397d03 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,29 +1,29 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.2.2) - actionpack (= 7.2.2) - activesupport (= 7.2.2) + actioncable (7.2.2.1) + actionpack (= 7.2.2.1) + activesupport (= 7.2.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.2.2) - actionpack (= 7.2.2) - activejob (= 7.2.2) - activerecord (= 7.2.2) - activestorage (= 7.2.2) - activesupport (= 7.2.2) + actionmailbox (7.2.2.1) + actionpack (= 7.2.2.1) + activejob (= 7.2.2.1) + activerecord (= 7.2.2.1) + activestorage (= 7.2.2.1) + activesupport (= 7.2.2.1) mail (>= 2.8.0) - actionmailer (7.2.2) - actionpack (= 7.2.2) - actionview (= 7.2.2) - activejob (= 7.2.2) - activesupport (= 7.2.2) + actionmailer (7.2.2.1) + actionpack (= 7.2.2.1) + actionview (= 7.2.2.1) + activejob (= 7.2.2.1) + activesupport (= 7.2.2.1) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.2.2) - actionview (= 7.2.2) - activesupport (= 7.2.2) + actionpack (7.2.2.1) + actionview (= 7.2.2.1) + activesupport (= 7.2.2.1) nokogiri (>= 1.8.5) racc rack (>= 2.2.4, < 3.2) @@ -32,15 +32,15 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (7.2.2) - actionpack (= 7.2.2) - activerecord (= 7.2.2) - activestorage (= 7.2.2) - activesupport (= 7.2.2) + actiontext (7.2.2.1) + actionpack (= 7.2.2.1) + activerecord (= 7.2.2.1) + activestorage (= 7.2.2.1) + activesupport (= 7.2.2.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.2.2) - activesupport (= 7.2.2) + actionview (7.2.2.1) + activesupport (= 7.2.2.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) @@ -50,22 +50,22 @@ GEM activemodel (>= 4.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (7.2.2) - activesupport (= 7.2.2) + activejob (7.2.2.1) + activesupport (= 7.2.2.1) globalid (>= 0.3.6) - activemodel (7.2.2) - activesupport (= 7.2.2) - activerecord (7.2.2) - activemodel (= 7.2.2) - activesupport (= 7.2.2) + activemodel (7.2.2.1) + activesupport (= 7.2.2.1) + activerecord (7.2.2.1) + activemodel (= 7.2.2.1) + activesupport (= 7.2.2.1) timeout (>= 0.4.0) - activestorage (7.2.2) - actionpack (= 7.2.2) - activejob (= 7.2.2) - activerecord (= 7.2.2) - activesupport (= 7.2.2) + activestorage (7.2.2.1) + actionpack (= 7.2.2.1) + activejob (= 7.2.2.1) + activerecord (= 7.2.2.1) + activesupport (= 7.2.2.1) marcel (~> 1.0) - activesupport (7.2.2) + activesupport (7.2.2.1) base64 benchmark (>= 0.3) bigdecimal @@ -117,9 +117,9 @@ GEM reline (>= 0.3.8) diff-lcs (1.5.1) docile (1.4.1) - dotenv (3.1.4) - dotenv-rails (3.1.4) - dotenv (= 3.1.4) + dotenv (3.1.6) + dotenv-rails (3.1.6) + dotenv (= 3.1.6) railties (>= 6.1) drb (2.2.1) erubi (1.13.0) @@ -150,7 +150,7 @@ GEM i18n (1.14.6) concurrent-ruby (~> 1.0) io-console (0.8.0) - irb (1.14.1) + irb (1.14.2) rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.9.0) @@ -182,7 +182,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.6.2) + logger (1.6.3) loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -205,17 +205,17 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.4) - nokogiri (1.17.0-aarch64-linux) + nokogiri (1.17.2-aarch64-linux) racc (~> 1.4) - nokogiri (1.17.0-arm-linux) + nokogiri (1.17.2-arm-linux) racc (~> 1.4) - nokogiri (1.17.0-arm64-darwin) + nokogiri (1.17.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.17.0-x86-linux) + nokogiri (1.17.2-x86-linux) racc (~> 1.4) - nokogiri (1.17.0-x86_64-darwin) + nokogiri (1.17.2-x86_64-darwin) racc (~> 1.4) - nokogiri (1.17.0-x86_64-linux) + nokogiri (1.17.2-x86_64-linux) racc (~> 1.4) openssl (3.2.0) ostruct (0.6.1) @@ -247,20 +247,20 @@ GEM rack (>= 1.3) rackup (2.2.1) rack (>= 3) - rails (7.2.2) - actioncable (= 7.2.2) - actionmailbox (= 7.2.2) - actionmailer (= 7.2.2) - actionpack (= 7.2.2) - actiontext (= 7.2.2) - actionview (= 7.2.2) - activejob (= 7.2.2) - activemodel (= 7.2.2) - activerecord (= 7.2.2) - activestorage (= 7.2.2) - activesupport (= 7.2.2) + rails (7.2.2.1) + actioncable (= 7.2.2.1) + actionmailbox (= 7.2.2.1) + actionmailer (= 7.2.2.1) + actionpack (= 7.2.2.1) + actiontext (= 7.2.2.1) + actionview (= 7.2.2.1) + activejob (= 7.2.2.1) + activemodel (= 7.2.2.1) + activerecord (= 7.2.2.1) + activestorage (= 7.2.2.1) + activesupport (= 7.2.2.1) bundler (>= 1.15.0) - railties (= 7.2.2) + railties (= 7.2.2.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -274,12 +274,12 @@ GEM activesupport (>= 4.2) choice (~> 0.2.0) ruby-graphviz (~> 1.2) - rails-html-sanitizer (1.6.1) + rails-html-sanitizer (1.6.2) loofah (~> 2.21) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (7.2.2) - actionpack (= 7.2.2) - activesupport (= 7.2.2) + railties (7.2.2.1) + actionpack (= 7.2.2.1) + activesupport (= 7.2.2.1) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -293,7 +293,7 @@ GEM rb-readline (0.5.5) rbs (3.7.0) logger - rdoc (6.8.1) + rdoc (6.9.0) psych (>= 4.0.0) redis (5.3.0) redis-client (>= 0.22.0) @@ -304,7 +304,7 @@ GEM redis-activesupport (5.3.0) activesupport (>= 3, < 8) redis-store (>= 1.3, < 2) - redis-client (0.22.2) + redis-client (0.23.0) connection_pool redis-namespace (1.11.0) redis (>= 4) @@ -321,7 +321,7 @@ GEM reline (0.5.12) io-console (~> 0.5) retries (0.0.5) - rexml (3.3.9) + rexml (3.4.0) rspec-core (3.13.2) rspec-support (~> 3.13.0) rspec-expectations (3.13.3) @@ -353,7 +353,7 @@ GEM rswag-ui (2.16.0) actionpack (>= 5.2, < 8.1) railties (>= 5.2, < 8.1) - rubocop (1.69.1) + rubocop (1.69.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -363,7 +363,7 @@ GEM rubocop-ast (>= 1.36.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.36.2) + rubocop-ast (1.37.0) parser (>= 3.3.1.0) rubocop-checkstyle_formatter (0.6.0) rubocop (>= 1.14.0) @@ -408,7 +408,7 @@ GEM rubocop (>= 1.27) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.2.0) + rubocop-rspec (3.3.0) rubocop (~> 1.61) rubocop-rspec_rails (2.30.0) rubocop (~> 1.61) @@ -463,7 +463,7 @@ GEM simplecov-lcov (0.8.0) simplecov_json_formatter (0.1.4) smart_properties (1.17.0) - sorbet-runtime (0.5.11690) + sorbet-runtime (0.5.11694) spring (4.2.1) sprockets (4.2.1) concurrent-ruby (~> 1.0) @@ -475,7 +475,7 @@ GEM stimulus-rails (1.3.4) railties (>= 6.0.0) stringio (3.1.2) - svix (1.43.0) + svix (1.44.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.3.2) diff --git a/docker-compose.yml b/docker-compose.yml index 210ebb887..484be6cca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -119,4 +119,3 @@ volumes: networks: battle-stadium-network: name: battle-stadium-network - external: true From 94864ca58048f78e77fdbc56ec7f70c5fc693d04 Mon Sep 17 00:00:00 2001 From: thatguyinabeanie Date: Sat, 14 Dec 2024 21:11:15 -0600 Subject: [PATCH 2/6] space --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index eedb52bac..9c25013db 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.6 \ No newline at end of file +3.3.6 From 680a031095b5f32a905280f2eec785b9ba698c45 Mon Sep 17 00:00:00 2001 From: thatguyinabeanie Date: Sat, 14 Dec 2024 22:10:08 -0600 Subject: [PATCH 3/6] spellings --- cspell.config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cspell.config.yaml b/cspell.config.yaml index c5cf23008..a82412585 100644 --- a/cspell.config.yaml +++ b/cspell.config.yaml @@ -34,6 +34,11 @@ words: - rewax - rowan - rsa + - libc + - libpq + - libreadline + - libvips + - healthcheck - Rswag - srand - swag From 362d7cd6ac20ea0aa027688e9aea528ec49c10ea Mon Sep 17 00:00:00 2001 From: thatguyinabeanie Date: Sat, 14 Dec 2024 22:12:57 -0600 Subject: [PATCH 4/6] spellings --- cspell.config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cspell.config.yaml b/cspell.config.yaml index a82412585..edf00d101 100644 --- a/cspell.config.yaml +++ b/cspell.config.yaml @@ -39,6 +39,7 @@ words: - libreadline - libvips - healthcheck + - devcontainers - Rswag - srand - swag From b05dbe85315bab017d146097ac679d9ab5c9469e Mon Sep 17 00:00:00 2001 From: thatguyinabeanie Date: Sun, 15 Dec 2024 14:23:03 -0600 Subject: [PATCH 5/6] save --- Dockerfile.dev | 2 +- cspell.config.yaml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Dockerfile.dev b/Dockerfile.dev index 3313c7571..e15fd25e6 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,7 +1,7 @@ ## ## BASE IMAGE WITH ASDF AND RUBY ## -FROM mcr.microsoft.com/devcontainers/ruby:3-bookworm AS base-image +FROM mcr.microsoft.com/devcontainers/ruby:3.3-bookworm AS base-image WORKDIR /battle-stadium COPY .ruby-version . diff --git a/cspell.config.yaml b/cspell.config.yaml index edf00d101..c5cf23008 100644 --- a/cspell.config.yaml +++ b/cspell.config.yaml @@ -34,12 +34,6 @@ words: - rewax - rowan - rsa - - libc - - libpq - - libreadline - - libvips - - healthcheck - - devcontainers - Rswag - srand - swag From b6ceba334929f42291bbc2204bc065ec35d1f798 Mon Sep 17 00:00:00 2001 From: thatguyinabeanie Date: Sun, 15 Dec 2024 14:24:52 -0600 Subject: [PATCH 6/6] save --- cspell.config.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cspell.config.yaml b/cspell.config.yaml index c5cf23008..9c6be00c6 100644 --- a/cspell.config.yaml +++ b/cspell.config.yaml @@ -58,5 +58,8 @@ words: - unregisters - sqltools - sonarlint + - libvips + - libpq + - healthcheck ignoreWords: [] import: []