diff options
| author | Evan Read <eread@gitlab.com> | 2020-01-09 02:05:25 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2020-01-09 02:05:25 +0300 |
| commit | 8c1320d7252c7ad8dd5b8d2be731e582afca9686 (patch) | |
| tree | 3a8545c241c8d2958d2a547f6843fdbf8aac4b0e | |
| parent | 2aa0622c9fac935b9fd61e1f94ceadd5f1aeae6e (diff) | |
| parent | e0c277e2f5791123d638d66993f53fdfc45f9c24 (diff) | |
Merge branch 'update-ruby-2-6-5' into 'master'
Update Ruby to 2.6.5
See merge request gitlab-org/gitlab-docs!668
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | dockerfiles/Dockerfile.gitlab-docs-base | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -84,13 +84,13 @@ One way is to use RVM: 1. Install the latest Ruby: ```sh - rvm install 2.6.3 + rvm install 2.6.5 ``` 1. Use the newly installed Ruby: ```sh - rvm use 2.6.3 + rvm use 2.6.5 ``` Check your Ruby version with `ruby --version`. @@ -133,7 +133,7 @@ Now let's make Bundler deal with the dependencies defined in the 1. Switch to Ruby using RVM: ```sh - rvm use 2.6.3 + rvm use 2.6.5 ``` 1. Run: diff --git a/dockerfiles/Dockerfile.gitlab-docs-base b/dockerfiles/Dockerfile.gitlab-docs-base index 5e03d3a1..7d38f1ca 100644 --- a/dockerfiles/Dockerfile.gitlab-docs-base +++ b/dockerfiles/Dockerfile.gitlab-docs-base @@ -2,7 +2,7 @@ # Image that contains all Nanoc dependencies and tools that # are needed to build the docs site and run the tests. # -FROM ruby:2.6.3-alpine3.10 +FROM ruby:2.6.5-alpine3.10 MAINTAINER GitLab Documentation Team # Install dependencies |