Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-11-25 14:19:01 +0300
committerAchilleas Pipinellis <axil@gitlab.com>2019-11-25 14:19:01 +0300
commitfaa6188d774404e304d2682235d06e00fc04fbbb (patch)
tree38421c188457be99c8c3f68fa7f879e57f707572 /Dockerfile.master
parent0bb191f7e450127a42997720368748351565546e (diff)
Revert "Exclude 12.3 from Dockerfile"
This reverts commit 9da9b9e1f684724b96e6694c34c87457de8a8989
Diffstat (limited to 'Dockerfile.master')
-rw-r--r--Dockerfile.master3
1 files changed, 1 insertions, 2 deletions
diff --git a/Dockerfile.master b/Dockerfile.master
index 5d67eae3..6efefd6d 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