Merge branch 'eread/switch-to-alpine-nodejs_current-package' into 'main'

Update to Ruby 3.2.1 and Alpine 3.17

See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3519

Merged-by: Achilleas Pipinellis <axil@gitlab.com>
Approved-by: Achilleas Pipinellis <axil@gitlab.com>
Reviewed-by: Matthias Käppler <mkaeppler@gitlab.com>
Co-authored-by: Evan Read <eread@gitlab.com>

8 files changed, 16 insertions, 15 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45b4f316..60319159 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,11 +21,11 @@ stages:
 variables:
   BUNDLE_PATH__SYSTEM: 'false'
   GIT_DEPTH: '20'
-  ALPINE_VERSION: '3.16'
-  VALE_VERSION: '2.23.0'
+  ALPINE_VERSION: '3.17'
+  VALE_VERSION: '2.24.0'
   MARKDOWNLINT_VERSION: '0.33.0'  # Version also set in package.json
   MARKDOWNLINT2_VERSION: '0.6.0'  # Version also set in package.json
-  RUBY_VERSION: '3.0.5'
+  RUBY_VERSION: '3.2.1'
 
 #
 # workflow:rules to prevent duplicate pipelines when pushing to a branch with an open MR.
diff --git a/.gitlab/ci/build-and-deploy.gitlab-ci.yml b/.gitlab/ci/build-and-deploy.gitlab-ci.yml
index 0dc25c4a..7a79135d 100644
--- a/.gitlab/ci/build-and-deploy.gitlab-ci.yml
+++ b/.gitlab/ci/build-and-deploy.gitlab-ci.yml
@@ -14,7 +14,7 @@
 
 # Common setup for review apps
 .review-environment:
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:www-gitlab-com-debian-bullseye-ruby-3.0-node-16
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:www-gitlab-com-debian-bullseye-ruby-3.2-node-18
   environment:
     name: review/$CI_COMMIT_REF_SLUG$REVIEW_SLUG
     url: https://$CI_COMMIT_REF_SLUG$REVIEW_SLUG.docs.gitlab-review.app
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index 4e80455e..26f99ab7 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -1,11 +1,11 @@
 FROM gitpod/workspace-full:2023-01-16-03-31-28
 USER gitpod
 
-# Install Ruby version 3.0.5 and set it as default.
+# Install Ruby version 3.2.1 and set it as default.
 # Required when the base Gitpod Docker image doesn't provide the version of Ruby we want.
 # For more information, see: https://www.gitpod.io/docs/languages/ruby.
 
-RUN _ruby_version=ruby-3.0.5 \
+RUN _ruby_version=ruby-3.2.1 \
     && printf "rvm_gems_path=/home/gitpod/.rvm\n" > ~/.rvmrc \
     && bash -lc "rvm reinstall ${_ruby_version} && \
                  rvm use ${_ruby_version} --default" \
diff --git a/.hadolint.yaml b/.hadolint.yaml
index 4a82d970..2f6ca0f1 100644
--- a/.hadolint.yaml
+++ b/.hadolint.yaml
@@ -1,3 +1,4 @@
 ignored:
   - DL3018
   - DL3022
+  - DL4006
diff --git a/.ruby-version b/.ruby-version
index eca690e7..e4604e3a 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.0.5
+3.2.1
diff --git a/.tool-versions b/.tool-versions
index 34d3a372..672f8d78 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,4 +1,4 @@
-ruby 3.0.5
+ruby 3.2.1
 nodejs 18.15.0
 shellcheck 0.9.0
 yarn 1.22.19
diff --git a/dockerfiles/gitlab-docs-lint-markdown.Dockerfile b/dockerfiles/gitlab-docs-lint-markdown.Dockerfile
index 233b809d..ab3f686c 100644
--- a/dockerfiles/gitlab-docs-lint-markdown.Dockerfile
+++ b/dockerfiles/gitlab-docs-lint-markdown.Dockerfile
@@ -48,5 +48,5 @@ RUN printf "\n\e[32mINFO: Installing markdownlint-cli %s..\e[39m\n" "${MARKDOWNL
 # Install markdownlint-cli2
 RUN printf "\n\e[32mINFO: Installing markdownlint-cli2 %s..\e[39m\n" "${MARKDOWNLINT2_VERSION}" \
   && yarn global add markdownlint-cli2@${MARKDOWNLINT2_VERSION} && yarn cache clean \
-  && echo "markdownlint-cli2: $(markdownlint-cli2 --version)" \
+  && markdownlint-cli2 | head -n 1 \
   && printf "\n"
diff --git a/dockerfiles/single.Dockerfile b/dockerfiles/single.Dockerfile
index bf3c55bf..383cd3f3 100644
--- a/dockerfiles/single.Dockerfile
+++ b/dockerfiles/single.Dockerfile
@@ -19,7 +19,7 @@ RUN apk add --no-cache git \
 
 #- Start of builder stage -#
 
-FROM ruby:3.0.5-alpine3.16 AS builder
+FROM ruby:3.2.1-alpine3.17 AS builder
 
 # Copy minifier binary from the minifier stage
 COPY --from=minifier /minify /usr/local/bin/minify
@@ -72,11 +72,11 @@ RUN apk add --no-cache -U \
 COPY . /source/
 WORKDIR /source
 
-RUN yarn install --frozen-lockfile                              \
-    && yarn cache clean                                         \
-    && bundle config set --local deployment true                \
-    && bundle install                                           \
-    && bundle exec rake default                                 \
+RUN yarn install --frozen-lockfile               \
+    && yarn cache clean                          \
+    && bundle config set --local deployment true \
+    && bundle install                            \
+    && bundle exec rake default                  \
     && bundle exec nanoc compile -VV
 
 RUN if [ "$SEARCH_BACKEND" = "lunr" ]; then make build-lunr-index; fi