diff options
| author | Kati Paizee <kpaizee@gitlab.com> | 2022-09-22 19:23:44 +0300 |
|---|---|---|
| committer | Kati Paizee <kpaizee@gitlab.com> | 2022-09-22 19:23:44 +0300 |
| commit | 0424099e5bad12b60aa91c7f087217fb83988fc6 (patch) | |
| tree | a8b6441c606f669751177fed66eb7b957bdecec9 | |
| parent | 2b88da126843a2b9281e6c6795af993da591df5b (diff) | |
| parent | ae7fdf977e9c82e8ad32824ec686b647b47ddd87 (diff) | |
Merge branch 'release-15-4' into 'main'
Release 15.4
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3115
Merged-by: Kati Paizee <kpaizee@gitlab.com>
| -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 bd5550f0..9d6eb2c9 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: + - "15.4" - "15.3" - "15.2" - - "15.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: + - "15.1" - "15.0" - "14.9" - "14.8" diff --git a/content/versions.json b/content/versions.json index 30b7439a..728c21d5 100644 --- a/content/versions.json +++ b/content/versions.json @@ -1,8 +1,8 @@ [ { - "next": "15.4", - "current": "15.3", - "last_minor": ["15.2", "15.1"], + "next": "15.5", + "current": "15.4", + "last_minor": ["15.3", "15.2"], "last_major": ["14.10", "13.12"] } ] diff --git a/latest.Dockerfile b/latest.Dockerfile index 7eb450ea..77dcecfd 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.4 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.3 ${TARGET} ${TARGET} 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} # List the two last major versions # Copy the versions found in 'content/_data/versions.yaml' under previous_majors |