diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 303c72b61616bd9e384146db94957e17950b461b..030f87a26819469f1a15f92d50446b6bdd75f230 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,15 +3,17 @@ { "name": "Ruby", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/ruby:1-3.3-bookworm", + "image": "ghcr.io/rails/devcontainer/images/ruby:3.4.2", "containerEnv": { "VISUAL": "code --wait", "TELEGRAM_DEFAULT_TARGET": "6828310083" // group:"-4715072196" - } + }, // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, + "features": { + "ghcr.io/rails/devcontainer/features/activestorage": {} + } // Use 'forwardPorts' to make a list of ports inside the container available locally. // "forwardPorts": [], diff --git a/.tool-versions b/.tool-versions index 041df9aa68dbbab58f579db4d7adfb8e162aeabd..ae5ecdb2b3e366fce3bd82fe3904841137e24415 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 3.4.1 +ruby 3.4.2 diff --git a/Dockerfile b/Dockerfile index 92c9be613d269bb031094c323241a86e79654fa0..c1c0afbe05fd8c12935477d1b37075e76f5a6c65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile # renovate: datasource=docker depName=registry.docker.com/library/ruby -ARG RUBY_VERSION=3.4.1 -FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base +ARG RUBY_VERSION=3.4.2 +FROM registry.docker.com/library/ruby:$RUBY_VERSION AS base # Rails app lives here WORKDIR /rails diff --git a/Gemfile b/Gemfile index 5f7357358e46002588027f760811f57e493bebe3..0197d14af58d4723301258749846df1b64b57c59 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -ruby "3.4.1" +ruby "3.4.2" gem "rails", "~> 8.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index 8e2a59aa07e68b340580d10473cee50f0c4a483a..4e0cc8ab9b55afbfeb0368b698759f71af32f6e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -403,7 +403,7 @@ DEPENDENCIES web-console (> 0) RUBY VERSION - ruby 3.4.1p0 + ruby 3.4.2p28 BUNDLED WITH 2.6.2 diff --git a/renovate.json b/renovate.json index 2d8f6311fd744b49762ad8ca336c10dddddbc1dd..b2f29f93884301115628ee27d3888a4e9a2cd186 100644 --- a/renovate.json +++ b/renovate.json @@ -17,7 +17,8 @@ "ruby", "ruby-version", "mcr.microsoft.com/devcontainers/ruby", - "registry.docker.com/library/ruby" + "registry.docker.com/library/ruby", + "ghcr.io/rails/devcontainer/images/ruby" ], "groupName": "ruby" }