From a57d79fd1d6b50b30fd81aaf98cf10174fb06996 Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Fri, 21 Feb 2025 08:16:14 +0000
Subject: [PATCH] Update alpine and ruby versions (#2951)

* Update ruby and alpine

* install libpq-dev

* Run bundle install
---
 .ruby-version | 2 +-
 Dockerfile    | 4 ++--
 Gemfile       | 2 +-
 Gemfile.lock  | 2 +-
 docs/setup.md | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 0aec50e6ed..9cec7165ab 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.4
+3.1.6
diff --git a/Dockerfile b/Dockerfile
index 5150b5b896..281fd6ca27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.1.4-alpine3.18 as base
+FROM ruby:3.1.6-alpine3.20 as base
 
 WORKDIR /app
 
@@ -10,7 +10,7 @@ RUN apk add --update --no-cache tzdata && \
 # build-base: compilation tools for bundle
 # yarn: node package manager
 # postgresql-dev: postgres driver and libraries
-RUN apk add --no-cache build-base=0.5-r3 busybox=1.36.1-r7 nodejs-current=20.8.1-r0 yarn=1.22.19-r0 postgresql13-dev=13.18-r0 bash=5.2.15-r5
+RUN apk add --no-cache build-base=0.5-r3 busybox=1.36.1-r29 nodejs=20.15.1-r0 yarn=1.22.22-r0 bash=5.2.26-r0 libpq-dev
 
 # Bundler version should be the same version as what the Gemfile.lock was bundled with
 RUN gem install bundler:2.6.4 --no-document
diff --git a/Gemfile b/Gemfile
index 033706b39b..ad13e49597 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.1.4"
+ruby "3.1.6"
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
 gem "rails", "~> 7.2.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index e1a34c6edd..2ac8465543 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -606,7 +606,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.1.4p223
+   ruby 3.1.6p260
 
 BUNDLED WITH
    2.6.4
diff --git a/docs/setup.md b/docs/setup.md
index 4400a7ae21..7b7eed9b92 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -66,8 +66,8 @@ We recommend using [nvm](https://github.com/nvm-sh/nvm) to manage NodeJS version
 4. Install Ruby and Bundler
 
    ```bash
-   rbenv install 3.1.4
-   rbenv global 3.1.4
+   rbenv install 3.1.6
+   rbenv global 3.1.6
    source ~/.bashrc
    gem install bundler
    ```