diff options
| author | Marcel Amirault <4155490-marcel.amirault@users.noreply.gitlab.com> | 2021-06-23 02:51:36 +0300 |
|---|---|---|
| committer | Marcel Amirault <4155490-marcel.amirault@users.noreply.gitlab.com> | 2021-06-23 02:51:36 +0300 |
| commit | 83e3d76ea9a95d0ae717c8d9e49c93fee2c4be88 (patch) | |
| tree | 72619164b123c76cc916a1c1680f8898823c2c7a | |
| parent | b27347aaedf00996d5b9fff2737f3b0810ffbfbe (diff) | |
| parent | eff1106f3e6c65c1ec18609db6b9179f6f93c031 (diff) | |
Merge branch 'release-14-0' into 'main'
Release 14.0
See merge request gitlab-org/gitlab-docs!1911
| -rw-r--r-- | Dockerfile.main | 9 | ||||
| -rw-r--r-- | content/_data/versions.yaml | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/Dockerfile.main b/Dockerfile.main index 50886c7c..7cbdd2af 100644 --- a/Dockerfile.main +++ b/Dockerfile.main @@ -45,14 +45,19 @@ RUN rm -rf /usr/share/nginx/html/* # Get all the archive static HTML and put it into place # Copy the versions found in 'content/_data/versions.yaml' under online +# +# Note: For the 14.2 release, when 13.12 is removed from this list, uncomment the +# 13.2 version from "List the two last major versions" section, and remove this note. +# +COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.0 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.12 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.11 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.10 ${TARGET} ${TARGET} # List the two last major versions # Copy the versions found in 'content/_data/versions.yaml' under previous_majors +# +# COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.12 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.10 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.11 ${TARGET} ${TARGET} # Get the built docs output from the previous build stage # This ordering means all previous layers can come from cache unless an archive diff --git a/content/_data/versions.yaml b/content/_data/versions.yaml index adf66943..f0749bc9 100644 --- a/content/_data/versions.yaml +++ b/content/_data/versions.yaml @@ -1,23 +1,24 @@ # The two last major supported versions # https://about.gitlab.com/support/statement-of-support.html#we-support-the-current-major-version-and-the-two-previous-major-versions previous_majors: +# - "13.12" -> Uncomment for 14.2, when 13.12 is removed from the 'online:' section. - "12.10" - - "11.11" # The first online version should always point to the # current stable version. online: + - "14.0" - "13.12" - "13.11" - - "13.10" -# The last version before the next major release +# The last version before the next major release. Verify near 14.10 as there may be more 14.X versions. last_before_new_major: - - "13.12" + - "14.10" # Versions not appearing in the dropdown, but available as Docker images # https://docs.gitlab.com/archives/#offline-archives offline: + - "13.10" - "13.9" - "13.8" - "13.7" |