diff options
| author | Suzanne Selhorn <sselhorn@gitlab.com> | 2022-07-22 23:30:23 +0300 |
|---|---|---|
| committer | Suzanne Selhorn <sselhorn@gitlab.com> | 2022-07-22 23:30:23 +0300 |
| commit | 8576e9529f95f6f7017f6746b51e6bfab0b8188c (patch) | |
| tree | b6384c22deca931992f64faf173be5b111e4e7ea | |
| parent | 4079cc4877dca8a86589f12281fbc6d3cffb8be1 (diff) | |
| parent | 9dc25ac427ed21ae5dfcea56f1125354a72591c0 (diff) | |
Merge branch 'release-15-2' into 'main'
Release 15.2 of docs site
See merge request gitlab-org/gitlab-docs!2929
| -rw-r--r-- | content/_data/versions.yaml | 3 | ||||
| -rw-r--r-- | content/versions.json | 6 | ||||
| -rw-r--r-- | latest.Dockerfile | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/content/_data/versions.yaml b/content/_data/versions.yaml index 306834bf..f45415ce 100644 --- a/content/_data/versions.yaml +++ b/content/_data/versions.yaml @@ -7,8 +7,8 @@ previous_majors: # The first online version should always point to the # current stable version. online: + - "15.2" - "15.1" - - "15.0" # The last version before the next major release. Verify near 14.10 as there may be more 14.X versions. last_before_new_major: @@ -17,6 +17,7 @@ last_before_new_major: # Versions not appearing in the dropdown, but available as Docker images # https://docs.gitlab.com/archives/#offline-archives offline: + - "15.0" - "14.9" - "14.8" - "14.7" diff --git a/content/versions.json b/content/versions.json index 4fdef565..db3e7483 100644 --- a/content/versions.json +++ b/content/versions.json @@ -1,8 +1,8 @@ [ { - "next": "15.2", - "current": "15.1", - "last_minor": ["15.0"], + "next": "15.3", + "current": "15.2", + "last_minor": ["15.1", "15.0"], "last_major": ["14.10", "13.12"] } ] diff --git a/latest.Dockerfile b/latest.Dockerfile index e565ee7e..e439a97a 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -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:15.2 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.1 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.0 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.10 ${TARGET} ${TARGET} # List the two last major versions # Copy the versions found in 'content/_data/versions.yaml' under previous_majors |