diff options
| author | Clayton Cornell <ccornell@gitlab.com> | 2022-11-23 00:18:36 +0300 |
|---|---|---|
| committer | Clayton Cornell <ccornell@gitlab.com> | 2022-11-23 00:18:36 +0300 |
| commit | 9c61332c3ceaa6e03aa264f7f3b394afbc5ad8e0 (patch) | |
| tree | 87aeb55d6a89da8a8945c8b27c29a9de850ba299 | |
| parent | bb9a1f49c41e1e53f7e77e86b48693c3ef9b7f8e (diff) | |
| parent | caca8b8ce09e68a4c2b691f338e53ff07c770e23 (diff) | |
Merge branch 'release-15-6' into 'main'
Release 15.6
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3288
Merged-by: Clayton Cornell <ccornell@gitlab.com>
| -rw-r--r-- | content/versions.json | 6 | ||||
| -rw-r--r-- | latest.Dockerfile | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/content/versions.json b/content/versions.json index 65b71bc9..f8c4238c 100644 --- a/content/versions.json +++ b/content/versions.json @@ -1,8 +1,8 @@ [ { - "next": "15.6", - "current": "15.5", - "last_minor": ["15.4", "15.3"], + "next": "15.7", + "current": "15.6", + "last_minor": ["15.5", "15.4"], "last_major": ["14.10", "13.12"] } ] diff --git a/latest.Dockerfile b/latest.Dockerfile index 7e83846f..50b5d71e 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -7,9 +7,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/versions.json' under "current" and "last_minor" +COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.6 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.5 ${TARGET} ${TARGET} 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} # List the two last major versions # Copy the versions found in 'content/versions.json' under "last_major" |