diff options
| author | Nick Gaskill <ngaskill@gitlab.com> | 2021-10-22 20:23:03 +0300 |
|---|---|---|
| committer | Nick Gaskill <ngaskill@gitlab.com> | 2021-10-22 20:23:03 +0300 |
| commit | 0eb2ca598ffe8d44a5d8d4c7f3b7910a522338c6 (patch) | |
| tree | c70259571c946d6952a883dfa5522cd65fb41578 | |
| parent | 8c464d812d6342f4eca0e76182e7251cb76f33b6 (diff) | |
| parent | 27ec6a7febad06730b2e1de75e95c0a4c0e3b70f (diff) | |
Merge branch 'release-14-4' into 'main'
Release 14.4
See merge request gitlab-org/gitlab-docs!2210
| -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 0accc44b..2c595275 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.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} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.1 ${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 2352a8a4..5e6ce2c8 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.4" - "14.3" - "14.2" - - "14.1" # 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.1" - "14.0" - "13.11" - "13.10" |