Merge branch 'eread/update-version-of-docker-used-by-project-in-pipelines' into 'main'

Update version of Docker used by project in pipelines

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

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

7 files changed, 12 insertions, 30 deletions

diff --git a/.gitlab/ci/docker-images.gitlab-ci.yml b/.gitlab/ci/docker-images.gitlab-ci.yml
index 39d328bd..7b9720c8 100644
--- a/.gitlab/ci/docker-images.gitlab-ci.yml
+++ b/.gitlab/ci/docker-images.gitlab-ci.yml
@@ -8,11 +8,11 @@
 .docker_prepare:
   extends:
     - .retry
-  image: docker:20.10.8
+  image: docker:24.0.2
   tags:
     - gitlab-org-docker
   services:
-    - docker:20.10.8-dind
+    - docker:24.0.2-dind
   before_script:
     - docker info
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
diff --git a/doc/releases.md b/doc/releases.md
index 94b41b7e..e7f828cf 100644
--- a/doc/releases.md
+++ b/doc/releases.md
@@ -335,9 +335,9 @@ To fix the error, make sure the Docker images for `image` and `services` use
 the same stable version. For example:
 
 ```yaml
-image: docker:20.10.8
+image: docker:24.0.2
 services:
-  - docker:20.10.8-dind
+  - docker:24.0.2-dind
 ```
 
 If the error still persists, use a more recent `docker:` version
diff --git a/dockerfiles/archives.Dockerfile b/dockerfiles/archives.Dockerfile
index baaa6a11..d5bc5414 100644
--- a/dockerfiles/archives.Dockerfile
+++ b/dockerfiles/archives.Dockerfile
@@ -9,20 +9,7 @@ ENV TARGET=/usr/share/nginx/html
 ## List the versions from oldest to newest to make use of Docker's
 ## cache when building the final archives image.
 
-## GitLab 13.X
-COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.0 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.1 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.2 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.3 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.4 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.5 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.6 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.7 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.8 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.9 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.10 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.11 ${TARGET} ${TARGET}
-# GitLab 14.X
+# GitLab 14.x
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.0 ${TARGET} ${TARGET}
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.1 ${TARGET} ${TARGET}
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.2 ${TARGET} ${TARGET}
@@ -33,7 +20,7 @@ COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.6 ${TARGET} ${TARGET}
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.7 ${TARGET} ${TARGET}
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.8 ${TARGET} ${TARGET}
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.9 ${TARGET} ${TARGET}
-# GitLab 15.X
+# GitLab 15.x
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.0 ${TARGET} ${TARGET}
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.1 ${TARGET} ${TARGET}
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.2 ${TARGET} ${TARGET}
@@ -44,7 +31,7 @@ COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.4 ${TARGET} ${TARGET}
 RUN rm -rf ${TARGET}/*.html
 
 ## When we start pushing the lunrjs images under the archives repository,
-## the Registry repository will change to 'archives:X.Y'.
+## the Registry repository will change to 'archives:x.y'.
 ## The first supported version is 15.5.
 ## See https://gitlab.com/gitlab-org/gitlab-docs/-/issues/1255.
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs/archives:15.5 ${TARGET} ${TARGET}
diff --git a/dockerfiles/gitlab-docs-base.Dockerfile b/dockerfiles/gitlab-docs-base.Dockerfile
index d9ea119d..ac1ec76f 100644
--- a/dockerfiles/gitlab-docs-base.Dockerfile
+++ b/dockerfiles/gitlab-docs-base.Dockerfile
@@ -1,8 +1,7 @@
-#
 # Base image for other Docker images
 # Includes all system dependencies to build the GitLab Docs site
 #
-# RUBY_VERSION and ALPINE_VERSION are defined in ../.gitlab-ci.yml
+# Values for RUBY_VERSION and ALPINE_VERSION are defined in .gitlab-ci.yml
 ARG RUBY_VERSION
 ARG ALPINE_VERSION
 
diff --git a/dockerfiles/gitlab-docs-lint-html.Dockerfile b/dockerfiles/gitlab-docs-lint-html.Dockerfile
index c4a491a6..1e59643c 100644
--- a/dockerfiles/gitlab-docs-lint-html.Dockerfile
+++ b/dockerfiles/gitlab-docs-lint-html.Dockerfile
@@ -1,6 +1,6 @@
 # GitLab Docs linting (HTML) Docker image
 #
-# RUBY_VERSION and ALPINE_VERSION are defined in ../.gitlab-ci.yml
+# Values for RUBY_VERSION and ALPINE_VERSION are defined in .gitlab-ci.yml
 ARG RUBY_VERSION
 ARG ALPINE_VERSION
 
diff --git a/dockerfiles/gitlab-docs-lint-markdown.Dockerfile b/dockerfiles/gitlab-docs-lint-markdown.Dockerfile
index ab3f686c..14b768e5 100644
--- a/dockerfiles/gitlab-docs-lint-markdown.Dockerfile
+++ b/dockerfiles/gitlab-docs-lint-markdown.Dockerfile
@@ -1,11 +1,11 @@
 # GitLab Docs linting (Markdown) Docker image
 #
-# ALPINE_VERSION is defined in ../.gitlab-ci.yml
+# Value for ALPINE_VERSION is defined in .gitlab-ci.yml
 ARG ALPINE_VERSION
 
 FROM alpine:${ALPINE_VERSION}
 
-# VALE_VERSION, MARKDOWNLINT_VERSION, and MARKDOWNLINT2_VERSION are defined in .gitlab-ci.yml
+# Values for VALE_VERSION, MARKDOWNLINT_VERSION, and MARKDOWNLINT2_VERSION are defined in .gitlab-ci.yml
 ARG VALE_VERSION
 ARG MARKDOWNLINT_VERSION
 ARG MARKDOWNLINT2_VERSION
diff --git a/dockerfiles/single.Dockerfile b/dockerfiles/single.Dockerfile
index c930a1ff..4e1156db 100644
--- a/dockerfiles/single.Dockerfile
+++ b/dockerfiles/single.Dockerfile
@@ -1,8 +1,7 @@
-#
 # Copy this Dockerfile to the root of each branch you want to create an archive
 # and rename it to X.Y.Dockerfile, where X.Y the major.minor GitLab version.
 #
-
+#- Start of builder build stage -#
 FROM ruby:3.2.2-alpine3.17 as builder
 
 # Set versions as build args to fetch corresponding branches
@@ -16,10 +15,8 @@ ENV SEARCH_BACKEND=$SEARCH_BACKEND
 ENV GOOGLE_SEARCH_KEY=$GOOGLE_SEARCH_KEY
 ENV NANOC_ENV=$NANOC_ENV
 
-#
 # Install Nanoc dependencies and tools that
 # are needed to build the docs site and run the tests.
-#
 RUN apk add --no-cache -U \
     bash        \
     build-base  \
@@ -88,7 +85,6 @@ RUN echo "<html><head><title>Redirect for ${VER}</title><meta http-equiv=\"refre
 #
 # Copy the ending HTML files from the previous 'builder' stage and copy them
 # to an NGINX Docker image.
-#
 FROM nginx:stable-alpine
 
 # Clean out any existing HTML files, and copy the HTML from the builder stage