diff options
author | Lorena Ciutacu <lciutacu@gitlab.com> | 2023-03-22 19:45:30 +0300 |
---|---|---|
committer | Lorena Ciutacu <lciutacu@gitlab.com> | 2023-03-22 19:45:30 +0300 |
commit | f08e69d57ee3cc43b44e8caa1d11849a6f560903 (patch) | |
tree | 328348a5f47a97f49619d5d0a030554dade74f82 | |
parent | 96f87e797a04ea447b82850d84226e95d660076f (diff) | |
parent | 500b1fac3045a8a1bcfbd6f26dad1ec23b324f50 (diff) |
Merge branch 'release-15-10' into 'main'
Docs release 15.10
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3689
Merged-by: Lorena Ciutacu <lciutacu@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 af0938b3..3c2b22f5 100644 --- a/.gitlab/ci/docker-images.gitlab-ci.yml +++ b/.gitlab/ci/docker-images.gitlab-ci.yml @@ -177,7 +177,7 @@ test:image:docs-single: - .rules_docker_image_tests stage: test variables: - GITLAB_VERSION: '15.9' + GITLAB_VERSION: '15.10' 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 5769a8ca..fb3dc7cc 100644 --- a/content/versions.json +++ b/content/versions.json @@ -1,8 +1,8 @@ [ { - "next": "15.10", - "current": "15.9", - "last_minor": ["15.8", "15.7"], + "next": "15.11", + "current": "15.10", + "last_minor": ["15.9", "15.8"], "last_major": ["14.10", "13.12"] } ] diff --git a/latest.Dockerfile b/latest.Dockerfile index c1301013..6c24e945 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.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} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.7 ${TARGET} ${TARGET} # List the two last major versions # Copy the versions found in 'content/versions.json' under "last_major" |