diff options
author | Fiona Neill <fneill@gitlab.com> | 2023-01-23 12:46:56 +0300 |
---|---|---|
committer | Fiona Neill <fneill@gitlab.com> | 2023-01-23 12:46:56 +0300 |
commit | 4338ff836d087a11d5861aeacaf92d2dfc04c115 (patch) | |
tree | 5b87d885b95a030f7e71cfed3bf46a9c20743fd6 | |
parent | 38cf8a6cd7c3a62d7caf22362d813a88ede99831 (diff) | |
parent | b13b9d3ad6f20a2fe26c5419dd809a0993bb4373 (diff) |
Merge branch 'release-15-8' into 'main'
Docs release 15.8
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3467
Merged-by: Fiona Neill <fneill@gitlab.com>
Approved-by: Fiona Neill <fneill@gitlab.com>
Co-authored-by: Ashraf Khamis <akhamis@gitlab.com>
-rw-r--r-- | .gitlab/ci/docker-images.gitlab-ci.yml | 2 | ||||
-rw-r--r-- | content/versions.json | 6 | ||||
-rw-r--r-- | latest.Dockerfile | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/.gitlab/ci/docker-images.gitlab-ci.yml b/.gitlab/ci/docker-images.gitlab-ci.yml index e7a52819..a3d006e5 100644 --- a/.gitlab/ci/docker-images.gitlab-ci.yml +++ b/.gitlab/ci/docker-images.gitlab-ci.yml @@ -185,7 +185,7 @@ test:image:docs-single: - .docker_prepare stage: test variables: - GITLAB_VERSION: '15.7' + GITLAB_VERSION: '15.8' DOCKERFILE: dockerfiles/single.Dockerfile IMAGE_NAME: $CI_REGISTRY_IMAGE:$GITLAB_VERSION NANOC_ENV: test diff --git a/content/versions.json b/content/versions.json index f4661898..42d76c90 100644 --- a/content/versions.json +++ b/content/versions.json @@ -1,8 +1,8 @@ [ { - "next": "15.8", - "current": "15.7", - "last_minor": ["15.6", "15.5"], + "next": "15.9", + "current": "15.8", + "last_minor": ["15.7", "15.6"], "last_major": ["14.10", "13.12"] } ] diff --git a/latest.Dockerfile b/latest.Dockerfile index 9e1be4e4..340a6e8f 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -7,12 +7,11 @@ 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.8 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.7 ${TARGET} ${TARGET} 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} # List the two last major versions # Copy the versions found in 'content/versions.json' under "last_major" COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.10 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.12 ${TARGET} ${TARGET} - |