diff options
| author | Fiona Neill <fneill@gitlab.com> | 2022-01-17 17:26:22 +0300 |
|---|---|---|
| committer | Fiona Neill <fneill@gitlab.com> | 2022-01-17 17:26:22 +0300 |
| commit | cee62c13cc6927b9a6184c6f759115efe3bea2d8 (patch) | |
| tree | cddfe613ce431a4fc2122230dc6e9f69082a65ea | |
| parent | e58441ad93f2320f973df977864382caf29b9d9f (diff) | |
| parent | c7de4a01a53f9c81c1c90a46f28099ac7a191459 (diff) | |
Merge branch 'eread/update-versions-for-docker-images' into 'main'
Update versions for Docker images
See merge request gitlab-org/gitlab-docs!2367
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | dockerfiles/Dockerfile.gitlab-docs-base | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d955d33f..f04474e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,9 +37,9 @@ variables: BRANCH_CHARTS: 'master' BUNDLE_PATH__SYSTEM: 'false' GIT_DEPTH: '20' - ALPINE_VERSION: '3.14' - VALE_VERSION: '2.12.0' - MARKDOWNLINT_VERSION: '0.29.0' + ALPINE_VERSION: '3.15' + VALE_VERSION: '2.14.0' + MARKDOWNLINT_VERSION: '0.30.0' RUBY_VERSION: '2.7.5' # diff --git a/dockerfiles/Dockerfile.gitlab-docs-base b/dockerfiles/Dockerfile.gitlab-docs-base index 894ac20b..476f1656 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.4-alpine3.14 +FROM ruby:2.7.5-alpine3.15 MAINTAINER GitLab Technical Writing team # Install dependencies |