diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2023-04-24 12:30:38 +0300 |
|---|---|---|
| committer | Marcel Amirault <mamirault@gitlab.com> | 2023-04-24 12:30:38 +0300 |
| commit | 554f24e7fb4e1e03df64d095d12aab90e57461e4 (patch) | |
| tree | 58b5f50751a3a4a50be1fc3dec3a54bfca09588b | |
| parent | 37e4f159375fd1000b607b0d056b869a14bfb734 (diff) | |
| parent | 044f52ef3d0c33502f305bd670b8f01f102ad227 (diff) | |
Merge branch 'release-15-11' into 'main'
Docs release 15.11
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3789
Merged-by: Marcel Amirault <mamirault@gitlab.com>
Approved-by: Marcel Amirault <mamirault@gitlab.com>
Co-authored-by: Evan Read <eread@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 | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab/ci/docker-images.gitlab-ci.yml b/.gitlab/ci/docker-images.gitlab-ci.yml index 5287f42d..95318e21 100644 --- a/.gitlab/ci/docker-images.gitlab-ci.yml +++ b/.gitlab/ci/docker-images.gitlab-ci.yml @@ -179,7 +179,7 @@ test:image:docs-single: - .rules_docker_single_images stage: test variables: - GITLAB_VERSION: '15.10' + GITLAB_VERSION: '15.11' 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 fb3dc7cc..cb9d8c65 100644 --- a/content/versions.json +++ b/content/versions.json @@ -1,8 +1,8 @@ [ { - "next": "15.11", - "current": "15.10", - "last_minor": ["15.9", "15.8"], + "next": "16.0", + "current": "15.11", + "last_minor": ["15.10", "15.9"], "last_major": ["14.10", "13.12"] } ] diff --git a/latest.Dockerfile b/latest.Dockerfile index 6c24e945..467730bf 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.11 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.10 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.9 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.8 ${TARGET} ${TARGET} # List the two last major versions # Copy the versions found in 'content/versions.json' under "last_major" |