diff options
| author | Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com> | 2021-11-22 21:07:46 +0300 |
|---|---|---|
| committer | Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com> | 2021-11-22 21:07:46 +0300 |
| commit | abf0539e15873465fb11bd5cd137e6712b5be877 (patch) | |
| tree | 10ec29ac174115b40431e5a0f84d8e00d3581763 | |
| parent | 3e9a0374c7f333ce973f90fe04dfce810a67cd5f (diff) | |
| parent | 68adac954020767faf07b9d5e66af52adaab0dda (diff) | |
Merge branch 'release-14-5' into 'main'
Release 14.5
See merge request gitlab-org/gitlab-docs!2263
| -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 2c595275..05c69f26 100644 --- a/Dockerfile.main +++ b/Dockerfile.main @@ -42,9 +42,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.5 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.4 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.3 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.2 ${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 5e6ce2c8..c4b9e599 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.5" - "14.4" - "14.3" - - "14.2" # 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.2" - "14.1" - "14.0" - "13.11" |