diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2022-08-22 16:34:59 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2022-08-22 16:34:59 +0300 |
| commit | 5ec7a07ef2fecb0d7102cc4e5cfa9ec12db4288e (patch) | |
| tree | e4f2a4f10b0c9c867973ad27a104a663438da188 | |
| parent | f03c008704f48c5f9e56c987b9f994165b34068f (diff) | |
| parent | 6f7d3596ba1b461c1374a6957fc2b1edc4544e61 (diff) | |
Merge branch 'release-15-3' into 'main'
Release 15.3
See merge request gitlab-org/gitlab-docs!3041
| -rw-r--r-- | content/_data/versions.yaml | 3 | ||||
| -rw-r--r-- | content/versions.json | 6 | ||||
| -rw-r--r-- | latest.Dockerfile | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/content/_data/versions.yaml b/content/_data/versions.yaml index b95595bc..bd5550f0 100644 --- a/content/_data/versions.yaml +++ b/content/_data/versions.yaml @@ -7,9 +7,9 @@ previous_majors: # The first online version should always point to the # current stable version. online: + - "15.3" - "15.2" - "15.1" - - "15.0" # The last version before the next major release. Verify near 14.10 as there may be more 14.X versions. last_before_new_major: @@ -18,6 +18,7 @@ last_before_new_major: # Versions not appearing in the dropdown, but available as Docker images # https://docs.gitlab.com/archives/#offline-archives offline: + - "15.0" - "14.9" - "14.8" - "14.7" diff --git a/content/versions.json b/content/versions.json index db3e7483..30b7439a 100644 --- a/content/versions.json +++ b/content/versions.json @@ -1,8 +1,8 @@ [ { - "next": "15.3", - "current": "15.2", - "last_minor": ["15.1", "15.0"], + "next": "15.4", + "current": "15.3", + "last_minor": ["15.2", "15.1"], "last_major": ["14.10", "13.12"] } ] diff --git a/latest.Dockerfile b/latest.Dockerfile index e439a97a..7eb450ea 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -42,9 +42,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/_data/versions.yaml' under online +COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.3 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.2 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.1 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.0 ${TARGET} ${TARGET} # List the two last major versions # Copy the versions found in 'content/_data/versions.yaml' under previous_majors |