diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-11-25 17:04:28 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-11-25 17:04:28 +0300 |
| commit | 42ac801099fadad6270b50de6174bb34bc9f6ecb (patch) | |
| tree | 2d1e5fdf93651d9a2824d8b14e080df27edde5f7 /Dockerfile.master | |
| parent | e5a762d839a28f1b260aa14bb5f1c62e681cfa2e (diff) | |
| parent | faa6188d774404e304d2682235d06e00fc04fbbb (diff) | |
Merge branch 'revert-9da9b9e1' into 'master'
Revert "Exclude 12.3 from Dockerfile"
See merge request gitlab-org/gitlab-docs!634
Diffstat (limited to 'Dockerfile.master')
| -rw-r--r-- | Dockerfile.master | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Dockerfile.master b/Dockerfile.master index 0e61f327..dddd6f2b 100644 --- a/Dockerfile.master +++ b/Dockerfile.master @@ -49,8 +49,7 @@ RUN rm -rf /usr/share/nginx/html/* # Copy the versions found in 'content/_data/versions.yaml' under online. COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.5 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.4 ${TARGET} ${TARGET} -# Until https://gitlab.com/gitlab-org/gitlab-docs/issues/467 is fixed -#COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.3 ${TARGET} ${TARGET} +COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.3 ${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 |