diff --git a/.ruby-version b/.ruby-version index a4dd9dba4f..a603bb50a2 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.4 +2.7.5 diff --git a/Gemfile b/Gemfile index 757351e7b9..fb179a407e 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ source 'https://rubygems.org' -ruby '~> 2.7.4' +ruby '~> 2.7.5' gem 'actionpack-xml_parser', '~> 2.0.0' gem 'activemodel-serializers-xml', '~> 1.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 87e26b1c07..2e7cb3223d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1138,7 +1138,7 @@ DEPENDENCIES with_advisory_lock (~> 4.6.0) RUBY VERSION - ruby 2.7.4p191 + ruby 2.7.5p203 BUNDLED WITH 2.1.4 diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile index baf5c62efd..c3479102d7 100644 --- a/docker/ci/Dockerfile +++ b/docker/ci/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.4-buster +FROM ruby:2.7.5-buster MAINTAINER operations@openproject.com ENV NODE_VERSION="14.17.0" diff --git a/docker/dev/backend/Dockerfile b/docker/dev/backend/Dockerfile index 7188c4b632..fe0ef9f0c0 100644 --- a/docker/dev/backend/Dockerfile +++ b/docker/dev/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.4-buster as develop +FROM ruby:2.7.5-buster as develop MAINTAINER operations@openproject.com ARG DEV_UID=1000 diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index 579256d887..e10fb4c420 100644 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.4-buster +FROM ruby:2.7.5-buster MAINTAINER operations@openproject.com # Allow platform-specific additions. Valid values are: on-prem,saas,bahn diff --git a/docs/development/development-environment-docker/README.md b/docs/development/development-environment-docker/README.md index 0626743d4a..d3133f6674 100644 --- a/docs/development/development-environment-docker/README.md +++ b/docs/development/development-environment-docker/README.md @@ -192,7 +192,7 @@ an error like the following when running `bin/compose setup`: ``` Creating core_backend_run ... done -Your Ruby version is 2.7.1, but your Gemfile specified ~> 2.7.4 +Your Ruby version is 2.7.1, but your Gemfile specified ~> 2.7.5 ``` This means that the current image is out-dated. You can update it like this: diff --git a/docs/development/development-environment-osx/README.md b/docs/development/development-environment-osx/README.md index 02f6cc6325..0cc162496b 100644 --- a/docs/development/development-environment-osx/README.md +++ b/docs/development/development-environment-osx/README.md @@ -32,20 +32,20 @@ $ rbenv init ### Installing ruby-2.7 With both installed, we can now install the actual ruby version 2.7. You can check available ruby versions with `rbenv install --list`. -At the time of this writing, the latest stable version is `2.7.4`, which we also require. +At the time of this writing, the latest stable version is `2.7.5`, which we also require. We suggest you install the version we require in the [Gemfile](https://github.com/opf/openproject/blob/dev/Gemfile). Search for the `ruby '~> X.Y.Z'` line and install that version. ```bash # Install the required version as read from the Gemfile -rbenv install 2.7.4 +rbenv install 2.7.5 ``` This might take a while depending on whether ruby is built from source. After it is complete, you need to tell rbenv to globally activate this version ```bash -rbenv global 2.7.4 +rbenv global 2.7.5 ``` You also need to install [bundler](https://github.com/bundler/bundler/), the ruby gem bundler. @@ -116,7 +116,7 @@ You should now have an active ruby and node installation. Verify that it works w ```bash $ ruby --version -ruby 2.7.4p191 (2021-07-07 revision a21a3b7d23) [x86_64-linux] +ruby 2.7.5p203 (2021-07-07 revision a21a3b7d23) [x86_64-linux] $ bundler --version Bundler version 2.1.4 diff --git a/docs/development/development-environment-ubuntu/README.md b/docs/development/development-environment-ubuntu/README.md index 988a4b603d..e85a2943c1 100644 --- a/docs/development/development-environment-ubuntu/README.md +++ b/docs/development/development-environment-ubuntu/README.md @@ -54,20 +54,20 @@ git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build ### Installing ruby-2.7 With both installed, we can now install the actual ruby version 2.7. You can check available ruby versions with `rbenv install --list`. -At the time of this writing, the latest stable version is `2.7.4`, which we also require. +At the time of this writing, the latest stable version is `2.7.5`, which we also require. We suggest you install the version we require in the [Gemfile](https://github.com/opf/openproject/blob/dev/Gemfile). Search for the `ruby '~> X.Y.Z'` line and install that version. ```bash # Install the required version as read from the Gemfile -rbenv install 2.7.4 +rbenv install 2.7.5 ``` This might take a while depending on whether ruby is built from source. After it is complete, you need to tell rbenv to globally activate this version ```bash -rbenv global 2.7.4 +rbenv global 2.7.5 rbenv rehash ``` @@ -155,7 +155,7 @@ You should now have an active ruby and node installation. Verify that it works w ```bash ruby --version -ruby 2.7.4p191 (2021-07-07 revision a21a3b7d23) [x86_64-linux] +ruby 2.7.5p203 (2021-07-07 revision a21a3b7d23) [x86_64-linux] bundler --version Bundler version 2.1.4 diff --git a/docs/installation-and-operations/installation/manual/README.md b/docs/installation-and-operations/installation/manual/README.md index 21c7f0625e..898b4c3fc3 100644 --- a/docs/installation-and-operations/installation/manual/README.md +++ b/docs/installation-and-operations/installation/manual/README.md @@ -106,16 +106,16 @@ time to finish. [openproject@host] source ~/.profile [openproject@host] git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build -[openproject@host] rbenv install 2.7.4 +[openproject@host] rbenv install 2.7.5 [openproject@host] rbenv rehash -[openproject@host] rbenv global 2.7.4 +[openproject@host] rbenv global 2.7.5 ``` To check our Ruby installation we run `ruby --version`. It should output something very similar to: ``` -ruby 2.7.4p191 (2021-07-07 revision a21a3b7d23) [x86_64-linux] +ruby 2.7.5p203 (2021-07-07 revision a21a3b7d23) [x86_64-linux] ``` ## Installation of Node