diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2020-08-21 18:56:13 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2020-08-21 18:56:13 +0300 |
| commit | 94b1d5203d314083731e3219c7ad03d13d1ab1c0 (patch) | |
| tree | e7ca03749de1f46a0a90e1e281d842ca7bc171db /Dockerfile.master | |
| parent | 57448091ce891154110ad51e418a82b26eb3921a (diff) | |
Release 13.3
Diffstat (limited to 'Dockerfile.master')
| -rw-r--r-- | Dockerfile.master | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Dockerfile.master b/Dockerfile.master index 772fdb60..99b8f008 100644 --- a/Dockerfile.master +++ b/Dockerfile.master @@ -44,16 +44,15 @@ COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild /etc/nginx/ 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 the versions found in 'content/_data/versions.yaml' under online +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} 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} # List the two last major versions -# Context https://gitlab.com/gitlab-org/gitlab-docs/issues/428 +# Copy the versions found in 'content/_data/versions.yaml' under previous_majors +COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.10 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.11 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.8 ${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 |