diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2022-02-22 20:04:44 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2022-02-22 20:04:44 +0300 |
| commit | 3e9a6bf31d37b99c674a57d1e15c4a3474e213b3 (patch) | |
| tree | 8b7a4ba280434b0b1818730b9ad26f72a9d300ca | |
| parent | 237cf9a72eda96c162a02972d526d071f11f939c (diff) | |
| parent | 83054dcacb61f5882697a196854da805970fe88f (diff) | |
Merge branch 'release-14-8' into 'main'
Release 14.8
See merge request gitlab-org/gitlab-docs!2454
| -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 31504bfb..b1d35f9b 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.8 ${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.6 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.5 ${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 5da164ac..ccbe1a37 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.8" - "14.7" - "14.6" - - "14.5" # 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.5" - "14.4" - "14.3" - "14.2" |