diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2020-05-22 12:11:09 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2020-05-22 12:11:09 +0300 |
| commit | ef36514ed892259edb5c86dd406ef41c1da2a3f8 (patch) | |
| tree | 1f0098eac784b11897fd28587df6503cff7fb5ce | |
| parent | f4d4a487b3b7730dc1d5ac8ed9ce1001dca8dc0e (diff) | |
Release 13.0
| -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 93421ee9..188a771f 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.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} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.8 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.7 ${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 9751f3cd..cc1ea783 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.0" - "12.10" - "12.9" - "12.8" - - "12.7" offline: + - "12.7" - "12.6" - "12.5" - "12.4" diff --git a/dockerfiles/Dockerfile.archives b/dockerfiles/Dockerfile.archives index 91b4f74a..3739121d 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.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} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.8 ${TARGET} ${TARGET} |