diff options
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | .ruby-version | 2 | ||||
| -rw-r--r-- | .tool-versions | 6 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | dockerfiles/Dockerfile.gitlab-docs-base | 2 | ||||
| -rw-r--r-- | dockerfiles/README.md | 3 |
6 files changed, 13 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a97eddc..96b0aa1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,10 +34,10 @@ variables: BRANCH_CHARTS: 'master' BUNDLE_PATH__SYSTEM: 'false' GIT_DEPTH: '20' - ALPINE_VERSION: '3.13' - VALE_VERSION: '2.10.2' - MARKDOWNLINT_VERSION: '0.26.0' - RUBY_VERSION: '2.7.2' + ALPINE_VERSION: '3.14' + VALE_VERSION: '2.10.4' + MARKDOWNLINT_VERSION: '0.28.1' + RUBY_VERSION: '2.7.4' # # Retry a job automatically if it fails (2 times) diff --git a/.ruby-version b/.ruby-version index 37c2961c..a4dd9dba 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.2 +2.7.4 diff --git a/.tool-versions b/.tool-versions index d25ba51a..7935f902 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ -ruby 2.7.2 -nodejs 14.17.3 -yarn 1.22.10 +ruby 2.7.4 +nodejs 14.17.5 +yarn 1.22.11 @@ -148,10 +148,10 @@ To install Ruby, Node.js, and Yarn using `asdf`: ``` 1. Set the installed versions of Ruby, Node.js, and Yarn to be global for projects that don't use - `.tool-versions` files. For example to set Ruby 2.7.2 as the global default, run: + `.tool-versions` files. For example to set Ruby 2.7.4 as the global default, run: ```shell - asdf global ruby 2.7.2 + asdf global ruby 2.7.4 ``` Check your: diff --git a/dockerfiles/Dockerfile.gitlab-docs-base b/dockerfiles/Dockerfile.gitlab-docs-base index 4a5a882c..894ac20b 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.7.2-alpine3.13 +FROM ruby:2.7.4-alpine3.14 MAINTAINER GitLab Technical Writing team # Install dependencies diff --git a/dockerfiles/README.md b/dockerfiles/README.md index 4158a7d7..0db27808 100644 --- a/dockerfiles/README.md +++ b/dockerfiles/README.md @@ -1 +1,2 @@ -[Read what all those Dockerfiles are about.](https://docs.gitlab.com/ee/development/documentation/site_architecture/release_process.html) +For information on these Dockerfiles, see +<https://docs.gitlab.com/ee/development/documentation/site_architecture/release_process.html> |