diff options
| author | Jon Glassman <jglassman@gitlab.com> | 2023-02-23 17:23:20 +0300 |
|---|---|---|
| committer | Jon Glassman <jglassman@gitlab.com> | 2023-02-23 17:23:20 +0300 |
| commit | 10746a2df285f189242f8274f1d9cbcdbdbf48f4 (patch) | |
| tree | 1d80f57ec41fe5834c14c34df084fd6b3a6fbc46 | |
| parent | 4ca163b85f6cfb83a78e0a9a5e75ed574f1c2a8d (diff) | |
| parent | 446e0b4c2587db9859e03f15af9f6dafcd11d3c9 (diff) | |
Merge branch 'release-15-9' into 'main'
Docs release 15.9
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3580
Merged-by: Jon Glassman <jglassman@gitlab.com>
Co-authored-by: Marcin Sedlak-Jakubowski <msedlakjakubowski@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 7058e09b..a04bfbaa 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.8' + GITLAB_VERSION: '15.9' 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 42d76c90..5769a8ca 100644 --- a/content/versions.json +++ b/content/versions.json @@ -1,8 +1,8 @@ [ { - "next": "15.9", - "current": "15.8", - "last_minor": ["15.7", "15.6"], + "next": "15.10", + "current": "15.9", + "last_minor": ["15.8", "15.7"], "last_major": ["14.10", "13.12"] } ] diff --git a/latest.Dockerfile b/latest.Dockerfile index 340a6e8f..c1301013 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.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} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.6 ${TARGET} ${TARGET} # List the two last major versions # Copy the versions found in 'content/versions.json' under "last_major" |