From 262eee3b835eb37637661d44bcbe73e6f55ab236 Mon Sep 17 00:00:00 2001
From: Renovate Runner Bot
<group_811_bot_db3dca68378189f49f57ab4b235c63f0@noreply.git.cccv.de>
Date: Wed, 5 Mar 2025 05:43:05 +0000
Subject: [PATCH 1/3] Update ruby to v3.4.2
---
.tool-versions | 2 +-
Dockerfile | 2 +-
Gemfile | 2 +-
Gemfile.lock | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.tool-versions b/.tool-versions
index 041df9a..ae5ecdb 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-ruby 3.4.1
+ruby 3.4.2
diff --git a/Dockerfile b/Dockerfile
index 92c9be6..265f938 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
# 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
+ARG RUBY_VERSION=3.4.2
FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base
# Rails app lives here
diff --git a/Gemfile b/Gemfile
index 5f73573..0197d14 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 8e2a59a..4e0cc8a 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
--
GitLab
From 58d9a2bdb1987fa7d28a904e8f55ed6a87a62344 Mon Sep 17 00:00:00 2001
From: Felix Eckhofer <felix@eckhofer.com>
Date: Wed, 5 Mar 2025 11:18:24 +0100
Subject: [PATCH 2/3] Switch from ruby-slim to ruby image
This is required in order to have -dev packages available during our
build stage. Apparently, this should have never worked and the upstream
image has just been cleaned up to align with documentation.
See https://github.com/docker-library/ruby/pull/497
Closes !25
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 265f938..c1c0afb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
# 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.2
-FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base
+FROM registry.docker.com/library/ruby:$RUBY_VERSION AS base
# Rails app lives here
WORKDIR /rails
--
GitLab
From 8017fda9cfb2bd4afe4d27f68c864ddd1978b4d2 Mon Sep 17 00:00:00 2001
From: Felix Eckhofer <felix@eckhofer.com>
Date: Wed, 5 Mar 2025 11:21:22 +0100
Subject: [PATCH 3/3] Switch devcontainer to image from rails project
---
.devcontainer/devcontainer.json | 8 +++++---
renovate.json | 3 ++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 303c72b..030f87a 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/renovate.json b/renovate.json
index 2d8f631..b2f29f9 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"
}
--
GitLab