diff options
| author | Kati Paizee <kpaizee@gitlab.com> | 2022-04-22 18:21:35 +0300 |
|---|---|---|
| committer | Kati Paizee <kpaizee@gitlab.com> | 2022-04-22 18:21:35 +0300 |
| commit | e77dbf6ffdf7622392887ee6525802c14242dab4 (patch) | |
| tree | 52925a06dd288784c2d04f5e945b7593510fffd0 | |
| parent | 209d6682ad1e187db91bb97a2f60c79f63e412f5 (diff) | |
| parent | e62f54982aaa6d244621a0466f3715a59de5e55f (diff) | |
Merge branch 'release-14-10' into 'main'
Release 14.10
See merge request gitlab-org/gitlab-docs!2590
| -rw-r--r-- | Dockerfile.main | 2 | ||||
| -rw-r--r-- | content/_data/versions.yaml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Dockerfile.main b/Dockerfile.main index 9db7ac64..8a744c01 100644 --- a/Dockerfile.main +++ b/Dockerfile.main @@ -43,9 +43,9 @@ 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 +COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.10 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.9 ${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.7 ${TARGET} ${TARGET} # List the two last major versions # Copy the versions found in 'content/_data/versions.yaml' under previous_majors diff --git a/content/_data/versions.yaml b/content/_data/versions.yaml index 78e6a480..21ea41a6 100644 --- a/content/_data/versions.yaml +++ b/content/_data/versions.yaml @@ -7,9 +7,9 @@ previous_majors: # The first online version should always point to the # current stable version. online: + - "14.10" - "14.9" - "14.8" - - "14.7" # The last version before the next major release. Verify near 14.10 as there may be more 14.X versions. last_before_new_major: @@ -18,6 +18,7 @@ last_before_new_major: # Versions not appearing in the dropdown, but available as Docker images # https://docs.gitlab.com/archives/#offline-archives offline: + - "14.7" - "14.6" - "14.5" - "14.4" |