Skip to content

Commit f98a9d2

Browse files
Upgrade ruby to 3.3.7
1 parent ac4ec83 commit f98a9d2

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

Diff for: .ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-3.3.5
1+
ruby-3.3.7

Diff for: Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) 2014 - 2023 UNICEF. All rights reserved.
44

55
source 'https://rubygems.org'
6-
ruby '3.3.5'
6+
ruby '3.3.7'
77

88
gem 'activerecord-nulldb-adapter' # Running Rake tasks at build time before DB is set up. TODO: Still needed?
99
gem 'activerecord-session_store', '~> 2.0'

Diff for: Gemfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ DEPENDENCIES
475475
memory_profiler
476476
minipack (~> 0.3)
477477
net-http-persistent (~> 4.0)
478-
nokogiri (~> 1.16)
478+
nokogiri (~> 1.18)
479479
pg (~> 1.5)
480480
prawn (~> 2.4)
481481
prawn-table (~> 0.2)
@@ -510,13 +510,13 @@ DEPENDENCIES
510510
text (~> 1.3)
511511
twitter_cldr (~> 4.4)
512512
tzinfo-data (~> 1.2023)
513-
uri (~> 0.12)
513+
uri (~> 0.13)
514514
web-push (~> 3.0)
515515
will_paginate (~> 4.0)
516516
write_xlsx (~> 1.11)
517517

518518
RUBY VERSION
519-
ruby 3.3.5p100
519+
ruby 3.3.7p123
520520

521521
BUNDLED WITH
522522
2.4.18

Diff for: azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
displayName: 'Install dependencies'
4242
- bash: |
4343
. ~/.bash_env
44-
rbenv global 3.3.5
44+
rbenv global 3.3.7
4545
bundle install --without production --path=${BUNDLE_PATH:-vendor/bundle}
4646
displayName: 'Bundle install'
4747
env:

Diff for: bitbucket-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ definitions:
44
steps:
55
- step: &server-test
66
name: Server tests
7-
image: ruby:3.3.5-bookworm
7+
image: ruby:3.3.7-bookworm
88
script:
99
- ./bin/install_local_test_solr.sh
1010
- ./bin/run_server_tests.sh

Diff for: doc/getting_started_development.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ In the Primero top-level directory, there is a file `.ruby-version`, which conta
111111

112112
```bash
113113
cat .ruby-version
114-
# This will print something like: ruby-3.3.5
114+
# This will print something like: ruby-3.3.7
115115
# rbenv needs the version number, but not the ruby- prefix.
116-
rbenv install 3.3.5 # replace 3.3.5 with whatever version is in .ruby-version
116+
rbenv install 3.3.7 # replace 3.3.7 with whatever version is in .ruby-version
117117
```
118118

119119
It will take several minutes to build and install ruby, depending on the speed of your machine.

Diff for: docker/application/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
# -------------------------------------------------------------------- BUILD STAGE
44
ARG BUILD_REGISTRY
5-
ARG RUBY_VERSION=3.3.5
6-
FROM ${BUILD_REGISTRY}ruby:${RUBY_VERSION}-alpine3.20 AS build-env
5+
ARG RUBY_VERSION=3.3.7
6+
FROM ${BUILD_REGISTRY}ruby:${RUBY_VERSION}-alpine3.21 AS build-env
77

88
ENV BUILD_PACKAGES="bash curl wget curl-dev build-base git"
99
ENV PYTHON_PACKAGES="python3 py3-pip"
@@ -101,11 +101,11 @@ RUN set -euox pipefail \
101101

102102
# -------------------------------------------------------------------- FINAL
103103
ARG BUILD_REGISTRY
104-
FROM ${BUILD_REGISTRY}ruby:${RUBY_VERSION}-alpine3.20
104+
FROM ${BUILD_REGISTRY}ruby:${RUBY_VERSION}-alpine3.21
105105

106106
ENV BUILD_PACKAGES=bash
107107
ENV RUNTIME_PACKAGES="libpq gettext libintl imagemagick libsodium-dev p7zip tini"
108-
ENV SECURITY_UPDATED_PACKAGES="libexpat=2.6.4-r0 curl=8.12.1-r0 musl=1.2.5-r1 musl-utils=1.2.5-r1 libxml2=2.12.7-r2 openssl=3.3.3-r0 "
108+
# ENV SECURITY_UPDATED_PACKAGES="libexpat=2.6.4-r0 curl=8.12.1-r0 musl=1.2.5-r1 musl-utils=1.2.5-r1 libxml2=2.12.7-r1 openssl=3.3.3-r0 "
109109

110110
ARG APP_UID
111111
ARG APP_GID
@@ -119,7 +119,7 @@ ENV RAILS_ENV=production
119119
# Install our packages
120120
RUN set -euox pipefail \
121121
; apk update \
122-
; apk add --no-cache $SECURITY_UPDATED_PACKAGES \
122+
# ; apk add --no-cache $SECURITY_UPDATED_PACKAGES \
123123
; apk add --no-cache $BUILD_PACKAGES \
124124
; apk add --no-cache $RUNTIME_PACKAGES \
125125
; rm -rf /var/cache/apk/*

0 commit comments

Comments
 (0)