diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-22 17:31:18 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-08-22 17:31:18 +0300 |
| commit | 3d0cc8d8dec7c0307749801be378487f31a47286 (patch) | |
| tree | 0d2226a4db12610324f386d05e346465a512026d | |
| parent | c2d949eecaedd00281029e704eec2705e0b5fbc5 (diff) | |
Release 12.2
| -rw-r--r-- | Dockerfile.master | 2 | ||||
| -rw-r--r-- | content/404.html | 2 | ||||
| -rw-r--r-- | content/_data/versions.yaml | 3 | ||||
| -rw-r--r-- | dockerfiles/Dockerfile.archives | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/Dockerfile.master b/Dockerfile.master index 5f3b420a..b6491d94 100644 --- a/Dockerfile.master +++ b/Dockerfile.master @@ -44,9 +44,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:12.2 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.1 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.0 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.11 ${TARGET} ${TARGET} # Get the built docs output from the previous build stage # This ordering means all previous layers can come from cache unless an archive diff --git a/content/404.html b/content/404.html index 94d588a3..b3f43522 100644 --- a/content/404.html +++ b/content/404.html @@ -39,7 +39,7 @@ searchbar: false <script type="text/javascript"> // Redirect to /archives on a non-existing versions // Place here all offline versions as seen inside content/_data/versions.yaml - if (/10.3|10.4|10.5|10.6|10.7|10.8|11.0|11.1|11.2|11.3|11.4|11.5|11.6|11.7|11.8|11.9|11.10/.test(window.location.href)) { + if (/10.3|10.4|10.5|10.6|10.7|10.8|11.0|11.1|11.2|11.3|11.4|11.5|11.6|11.7|11.8|11.9|11.10|11.11/.test(window.location.href)) { window.location.replace("https://docs.gitlab.com/archives"); } </script> diff --git a/content/_data/versions.yaml b/content/_data/versions.yaml index 2d4b42d6..49eb3b89 100644 --- a/content/_data/versions.yaml +++ b/content/_data/versions.yaml @@ -1,11 +1,12 @@ # The first online version should always point to the # current stable version. online: + - "12.2" - "12.1" - "12.0" - - "11.11" offline: + - "11.11" - "11.10" - "11.9" - "11.8" diff --git a/dockerfiles/Dockerfile.archives b/dockerfiles/Dockerfile.archives index 30bfe73f..1a8a09f7 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:12.2 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.1 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.0 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.11 ${TARGET} ${TARGET} |