diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2020-10-23 08:16:47 +0300 |
|---|---|---|
| committer | Marcel Amirault <mamirault@gitlab.com> | 2020-10-23 08:16:47 +0300 |
| commit | 89b57d4a858852666c9876e2160a0040117b545e (patch) | |
| tree | 2d6ad8c4d99e7e29f0f9e1b926a0fcabd631f72d | |
| parent | 4fe05d054d5e2508819a51b041d3891b5c21b657 (diff) | |
Release 13.5
| -rw-r--r-- | Dockerfile.master | 2 | ||||
| -rw-r--r-- | content/_data/versions.yaml | 3 | ||||
| -rw-r--r-- | dockerfiles/Dockerfile.archives | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Dockerfile.master b/Dockerfile.master index dae06597..a43a235c 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.5 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.4 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.3 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.2 ${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 e7bb22ee..19415990 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.5" - "13.4" - "13.3" - - "13.2" # Versions not appearing in the dropdown, but available as Docker images # https://docs.gitlab.com/archives/#offline-archives offline: + - "13.2" - "13.1" - "13.0" - "12.9" diff --git a/dockerfiles/Dockerfile.archives b/dockerfiles/Dockerfile.archives index 5ce5d0ce..07d7fa5c 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.5 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.4 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.3 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.2 ${TARGET} ${TARGET} |