diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-05-22 18:57:01 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-05-22 18:57:01 +0300 |
| commit | e05da499311289ebdcabbddd249a4dfe93c2e58b (patch) | |
| tree | 7766fb09119040bbf511e4777f036feab6c3c635 | |
| parent | 1d7fe4eecef7c02ddf6f3ca2b787c6d01cde744f (diff) | |
| parent | 6dfe8a53f02e95377e3e82f3759c0faae9ee4332 (diff) | |
Merge branch 'release-10-8' into 'master'
Release 10.8
See merge request gitlab-com/gitlab-docs!266
| -rw-r--r-- | Dockerfile.master | 2 | ||||
| -rw-r--r-- | content/_data/versions.yaml | 5 | ||||
| -rw-r--r-- | dockerfiles/Dockerfile.archives | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Dockerfile.master b/Dockerfile.master index 3ee556c3..900e654e 100644 --- a/Dockerfile.master +++ b/Dockerfile.master @@ -26,9 +26,9 @@ RUN rm -rf /usr/share/nginx/html/* # Go oldest-to-newest to take advantage of the fact that we change older # archives less often than new ones. Copy the versions found in # 'content/_data/versions.yaml' under current and previous. -COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.5 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.6 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.7 ${TARGET} ${TARGET} +COPY --from=registry.gitlab.com/gitlab-com/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 diff --git a/content/_data/versions.yaml b/content/_data/versions.yaml index 827db6f1..891fa5ac 100644 --- a/content/_data/versions.yaml +++ b/content/_data/versions.yaml @@ -1,10 +1,11 @@ current: -- '10.7' +- '10.8' previous: +- '10.7' - '10.6' -- '10.5' offline: +- '10.5' - '10.4' - '10.3' diff --git a/dockerfiles/Dockerfile.archives b/dockerfiles/Dockerfile.archives index 55839f5d..6ecd47a8 100644 --- a/dockerfiles/Dockerfile.archives +++ b/dockerfiles/Dockerfile.archives @@ -14,6 +14,7 @@ COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.4 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.5 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.6 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.7 ${TARGET} ${TARGET} +COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.8 ${TARGET} ${TARGET} # Serve the site (target), which is now all static HTML CMD echo -e "GitLab docs are viewable at:\nhttp://0.0.0.0:4000"; exec nginx -g 'daemon off;' |