diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2020-07-16 14:37:30 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2020-07-16 14:37:30 +0300 |
| commit | b274912007b94aeaf673facfe0764dc3b9b019f4 (patch) | |
| tree | eb77ac58705eca7a5a897cc156352a36ec0c9813 | |
| parent | 56bac9935122c359126b6022c1edf1f52e3100c3 (diff) | |
Release 13.2
| -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 eff8ae0f..772fdb60 100644 --- a/Dockerfile.master +++ b/Dockerfile.master @@ -45,10 +45,10 @@ 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.2 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.1 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.0 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.10 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.9 ${TARGET} ${TARGET} # List the two last major versions # Context https://gitlab.com/gitlab-org/gitlab-docs/issues/428 diff --git a/content/_data/versions.yaml b/content/_data/versions.yaml index 2c20c142..ac0e3ed9 100644 --- a/content/_data/versions.yaml +++ b/content/_data/versions.yaml @@ -1,12 +1,13 @@ # The first online version should always point to the # current stable version. online: + - "13.2" - "13.1" - "13.0" - "12.10" - - "12.9" offline: + - "12.9" - "12.8" - "12.7" - "12.6" diff --git a/dockerfiles/Dockerfile.archives b/dockerfiles/Dockerfile.archives index 0026e6db..b52aa4f8 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.2 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.1 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.0 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.10 ${TARGET} ${TARGET} |