diff --git a/Dockerfile.dev b/Dockerfile.dev index a3e0daa..8daecd9 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,10 +1,10 @@ -FROM ruby:3.3 +FROM ruby:3.4 -RUN gem install bundler -v 2.5 +RUN gem install bundler WORKDIR /src -COPY Gemfile Gemfile.lock ./ +COPY Gemfile Gemfile.l*ck ./ RUN bundle check || bundle install diff --git a/Gemfile b/Gemfile index d6a34ec..c410f94 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,14 @@ source 'https://rubygems.org' -gem 'sinatra', '~> 3.0' -gem 'sinatra-contrib', '~> 3.0' -gem 'puma', '~> 6.3' +gem 'sinatra', '~> 3.2' +gem 'sinatra-contrib', '~> 3.2' +gem 'puma', '~> 6.6' -gem 'sequel', '~> 5.70' -gem 'sqlite3', '~> 1.7' +gem 'sequel', '~> 5.92' +gem 'sqlite3', '~> 2.6' + +gem 'logger' +gem 'ostruct' group :development, :test do gem 'rerun' diff --git a/Gemfile.lock b/Gemfile.lock index a852574..1714ff3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,56 +1,61 @@ GEM remote: https://rubygems.org/ specs: - ast (2.4.2) + ast (2.4.3) base64 (0.2.0) - bigdecimal (3.1.6) - ffi (1.16.3) - json (2.7.1) - language_server-protocol (3.17.0.3) - listen (3.8.0) + bigdecimal (3.2.0) + ffi (1.17.2-x86_64-linux-gnu) + json (2.12.2) + language_server-protocol (3.17.0.5) + lint_roller (1.1.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.4) multi_json (1.15.0) - mustermann (3.0.0) + mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - nio4r (2.7.0) - parallel (1.24.0) - parser (3.3.0.5) + nio4r (2.7.4) + ostruct (0.6.1) + parallel (1.27.0) + parser (3.3.8.0) ast (~> 2.4.1) racc - puma (6.4.2) + prism (1.4.0) + puma (6.6.0) nio4r (~> 2.0) - racc (1.7.3) - rack (2.2.8) + racc (1.8.1) + rack (2.2.16) rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) rainbow (3.1.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - regexp_parser (2.9.0) + regexp_parser (2.10.0) rerun (0.14.0) listen (~> 3.0) - rexml (3.2.6) - rubocop (1.60.2) + rubocop (1.75.8) json (~> 2.3) - language_server-protocol (>= 3.17.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.44.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-sequel (0.3.4) - rubocop (~> 1.0) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.44.1) + parser (>= 3.3.7.2) + prism (~> 1.4) + rubocop-sequel (0.4.1) + lint_roller (~> 1.1) + rubocop (>= 1.72.1, < 2) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - sequel (5.77.0) + sequel (5.92.0) bigdecimal sinatra (3.2.0) mustermann (~> 3.0) @@ -63,22 +68,26 @@ GEM rack-protection (= 3.2.0) sinatra (= 3.2.0) tilt (~> 2.0) - sqlite3 (1.7.2-x86_64-linux) - tilt (2.3.0) - unicode-display_width (2.5.0) + sqlite3 (2.6.0-x86_64-linux-gnu) + tilt (2.6.0) + unicode-display_width (3.1.4) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) PLATFORMS - x86_64-linux + x86_64-linux-gnu DEPENDENCIES - puma (~> 6.3) + logger + ostruct + puma (~> 6.6) rerun rubocop rubocop-sequel - sequel (~> 5.70) - sinatra (~> 3.0) - sinatra-contrib (~> 3.0) - sqlite3 (~> 1.7) + sequel (~> 5.92) + sinatra (~> 3.2) + sinatra-contrib (~> 3.2) + sqlite3 (~> 2.6) BUNDLED WITH - 2.5.3 + 2.6.9 diff --git a/bin/docker-run.sh b/bin/docker-run.sh index 844487a..71e1669 100755 --- a/bin/docker-run.sh +++ b/bin/docker-run.sh @@ -1,3 +1,3 @@ #!/bin/sh -docker run --rm -d -v "$(pwd):/src" -p 9292:9292 --name game-data game-data +docker run --rm -d -t -v "$(pwd):/src" -p 9292:9292 --name game-data game-data