diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-12-21 23:34:52 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-12-21 23:34:52 +0300 |
| commit | cc8d66a146ba020e5268d77d38f8bdc809cfb884 (patch) | |
| tree | ffa78c7ee3b5eb04a97e29d6668ff401493b7391 /dockerfiles | |
| parent | adabb45159a772be86c9494f7ea327df3c6ecf12 (diff) | |
| parent | 4df5519faa8dc2509ae344b64ea7d5345383b8df (diff) | |
Merge branch 'release-11-6' into 'master'
Release 11.6
See merge request gitlab-com/gitlab-docs!379
Diffstat (limited to 'dockerfiles')
| -rw-r--r-- | dockerfiles/Dockerfile.archives | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dockerfiles/Dockerfile.archives b/dockerfiles/Dockerfile.archives index f9002c4b..0b861dd7 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-com/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-com/gitlab-docs:11.6 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.5 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.4 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.3 ${TARGET} ${TARGET} |