diff options
author | Evan Read <eread@gitlab.com> | 2023-10-30 07:43:54 +0300 |
---|---|---|
committer | Evan Read <eread@gitlab.com> | 2023-10-30 07:43:54 +0300 |
commit | ec890739807a72c168af9b8c94906d63b986b767 (patch) | |
tree | c0b6c2ce31cbc415ad911a7750b729939051d99e | |
parent | e56fd750f5804a6f4d1c79fbb72375438df36ef0 (diff) |
Add Ruby to docs Markdown linting Docker image
-rw-r--r-- | .gitlab-ci.yml | 8 | ||||
-rw-r--r-- | dockerfiles/gitlab-docs-lint-html.Dockerfile | 2 | ||||
-rw-r--r-- | dockerfiles/gitlab-docs-lint-markdown.Dockerfile | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a9b3980e..bf346226 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,11 +22,11 @@ variables: BUNDLE_PATH__SYSTEM: 'false' GIT_DEPTH: '20' ALPINE_VERSION: '3.18' - VALE_VERSION: '2.27.0' - MARKDOWNLINT_VERSION: '0.36.0' # Version also set in package.json - MARKDOWNLINT2_VERSION: '0.9.2' # Version also set in package.json + VALE_VERSION: '2.29.6' + MARKDOWNLINT_VERSION: '0.37.0' # Version also set in package.json + MARKDOWNLINT2_VERSION: '0.10.0' # Version also set in package.json RUBY_VERSION: '3.2.2' - ASDF_VERSION: '0.12.0' + ASDF_VERSION: '0.13.1' # # workflow:rules to prevent duplicate pipelines when pushing to a branch with an open MR. diff --git a/dockerfiles/gitlab-docs-lint-html.Dockerfile b/dockerfiles/gitlab-docs-lint-html.Dockerfile index b27a3c3e..baf4e2e2 100644 --- a/dockerfiles/gitlab-docs-lint-html.Dockerfile +++ b/dockerfiles/gitlab-docs-lint-html.Dockerfile @@ -28,7 +28,7 @@ RUN printf "\n\e[32mINFO: Installing dependencies..\e[39m\n" && apk add --no-cac xz-dev \ yarn \ && echo 'gem: --no-document' >> /etc/gemrc \ - && gem update --system \ + && gem update --silent --system \ && printf "\n\e[32mINFO: Dependency versions:\e[39m\n" \ && echo "Ruby: $(ruby --version)" \ && echo "RubyGems: $(gem --version)" \ diff --git a/dockerfiles/gitlab-docs-lint-markdown.Dockerfile b/dockerfiles/gitlab-docs-lint-markdown.Dockerfile index a3fed56d..f5999cb9 100644 --- a/dockerfiles/gitlab-docs-lint-markdown.Dockerfile +++ b/dockerfiles/gitlab-docs-lint-markdown.Dockerfile @@ -25,9 +25,14 @@ RUN printf "\n\e[32mINFO: Installing dependencies..\e[39m\n" && apk add --no-cac nodejs \ openssl \ pngquant \ + ruby \ tar \ yarn \ + && echo 'gem: --no-document' >> /etc/gemrc \ + && gem update --silent --system \ && printf "\n\e[32mINFO: Dependency versions:\e[39m\n" \ + && echo "Ruby: $(ruby --version)" \ + && echo "RubyGems: $(gem --version)" \ && echo "Node.js: $(node --version)" \ && echo "Yarn: $(yarn --version)" \ && printf "\n" @@ -36,6 +41,7 @@ RUN printf "\n\e[32mINFO: Installing dependencies..\e[39m\n" && apk add --no-cac RUN printf "\n\e[32mINFO: Installing Vale %s..\e[39m\n" "${VALE_VERSION}" \ && wget --quiet https://github.com/errata-ai/vale/releases/download/v${VALE_VERSION}/vale_${VALE_VERSION}_Linux_64-bit.tar.gz \ && tar -xvzf vale_${VALE_VERSION}_Linux_64-bit.tar.gz -C bin \ + && rm vale_${VALE_VERSION}_Linux_64-bit.tar.gz \ && echo "Vale: $(vale --version)" \ && printf "\n" |