diff options
| author | Evan Read <eread@gitlab.com> | 2022-06-23 03:21:14 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2022-06-23 03:21:14 +0300 |
| commit | 98e1da2d779487f90167bae451163abf9c3e365c (patch) | |
| tree | 4ebd15c2615cb90805676efd3acf3049627c680c | |
| parent | 5d5fe32fd1c68f182acfe889038af859d381c911 (diff) | |
| parent | c3db881aece6dfbf9a92ce8f24721bdd1ca5577d (diff) | |
Merge branch 'release-15-1' into 'main'
Release 15.1
See merge request gitlab-org/gitlab-docs!2834
| -rw-r--r-- | content/_data/versions.yaml | 3 | ||||
| -rw-r--r-- | latest.Dockerfile | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/content/_data/versions.yaml b/content/_data/versions.yaml index 568573b4..67294443 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.1" - "15.0" - "14.10" - - "14.9" # 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: + - "14.9" - "14.8" - "14.7" - "14.6" diff --git a/latest.Dockerfile b/latest.Dockerfile index a78ba557..e565ee7e 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.1 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:15.0 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.10 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.9 ${TARGET} ${TARGET} # List the two last major versions # Copy the versions found in 'content/_data/versions.yaml' under previous_majors |