diff options
author | Mike Jang <mjang@gitlab.com> | 2021-03-22 17:42:23 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2021-03-22 17:42:23 +0300 |
commit | 69cba61aa8287a84cbff7a60209e2cb408b8198c (patch) | |
tree | ab99d173f5419cc15e13d1dc5063c69f0acae5b8 | |
parent | 94b86e670ac9ea32b99da148df14ef45e3c48541 (diff) |
Release 13.10
-rw-r--r-- | .gitlab/merge_request_templates/Release.md | 5 | ||||
-rw-r--r-- | Dockerfile.master | 2 | ||||
-rw-r--r-- | content/_data/versions.yaml | 3 | ||||
-rw-r--r-- | dockerfiles/Dockerfile.archives | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/.gitlab/merge_request_templates/Release.md b/.gitlab/merge_request_templates/Release.md index 2cfe7535a..b23aa4020 100644 --- a/.gitlab/merge_request_templates/Release.md +++ b/.gitlab/merge_request_templates/Release.md @@ -9,17 +9,16 @@ 1. [ ] Edit `content/_data/versions.yaml` and rotate the versions. 1. [ ] Edit `dockerfiles/Dockerfile.archives` and add the new version. 1. [ ] Edit `Dockerfile.master` and rotate the versions. -1. [ ] \(Optional) If there are changes in the stable branches of the docs **after** the release version Docker image was created, rerun the release version pipeline. ## Before merge -On the 22nd, before merging this and **right after a scheduled pipeline has run**: +On the 22nd, before merging this MR: 1. [ ] Bump the dropdown versions for all online versions: ```sh bundle exec rake release:dropdowns ``` - This will create all the needed merge requests and will set them to MWPS. + This will create all the [needed merge requests](https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests?label_name[]=release) and will set them to MWPS. 1. [ ] Once all above MRs are merged, check the newly-created pipelines of the respective versions https://gitlab.com/gitlab-org/gitlab-docs/pipelines. Once they are green, it's time to merge this MR. diff --git a/Dockerfile.master b/Dockerfile.master index c740ff7bd..5ddd165e1 100644 --- a/Dockerfile.master +++ b/Dockerfile.master @@ -45,9 +45,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:13.10 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.9 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.8 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.7 ${TARGET} ${TARGET} # List the two last major versions # Copy the versions found in 'content/_data/versions.yaml' under previous_majors diff --git a/content/_data/versions.yaml b/content/_data/versions.yaml index 3aceeaf6f..b92fec180 100644 --- a/content/_data/versions.yaml +++ b/content/_data/versions.yaml @@ -7,13 +7,14 @@ previous_majors: # The first online version should always point to the # current stable version. online: + - "13.10" - "13.9" - "13.8" - - "13.7" # Versions not appearing in the dropdown, but available as Docker images # https://docs.gitlab.com/archives/#offline-archives offline: + - "13.7" - "13.6" - "13.5" - "13.4" diff --git a/dockerfiles/Dockerfile.archives b/dockerfiles/Dockerfile.archives index 4680c2ae6..0ec222561 100644 --- a/dockerfiles/Dockerfile.archives +++ b/dockerfiles/Dockerfile.archives @@ -7,6 +7,7 @@ ENV TARGET=/usr/share/nginx/html COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf # Get all the archive static HTML and put it into place +COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.10 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.9 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.8 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.7 ${TARGET} ${TARGET} |