diff --git a/.github/Dockerfile.base b/.github/Dockerfile.base index 9f982579..405573d0 100644 --- a/.github/Dockerfile.base +++ b/.github/Dockerfile.base @@ -3,7 +3,7 @@ # call this from rails root: podman build -t mapforge-base -f .github/Dockerfile.base . # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile -ARG RUBY_VERSION=4.0.0 +ARG RUBY_VERSION=4.0.5 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base LABEL org.opencontainers.image.source="https://github.com/mapforge-org/mapforge" diff --git a/.gitignore b/.gitignore index f05e1622..40e166d8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ # Ignore bundler config. /.bundle +/vendor/bundle # Ignore all environment files (except templates). /.env* diff --git a/.ruby-version b/.ruby-version index fcdb2e10..7636e756 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -4.0.0 +4.0.5 diff --git a/Gemfile b/Gemfile index 4c00fa8f..26f69fc8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org" -ruby "4.0.0" +ruby "4.0.5" gem "rails" diff --git a/Gemfile.lock b/Gemfile.lock index cc4fc45a..454652ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -105,7 +105,7 @@ GEM benchmark (0.5.0) bigdecimal (4.1.2) bindex (0.8.1) - bootsnap (1.24.1) + bootsnap (1.24.4) msgpack (~> 1.2) brakeman (8.0.4) racc @@ -702,7 +702,7 @@ DEPENDENCIES yabeda-rails RUBY VERSION - ruby 4.0.0p0 + ruby 4.0.5 BUNDLED WITH 4.0.3