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-07-11 14:52:18 +0300
committerAchilleas Pipinellis <axil@gitlab.com>2019-07-12 12:57:54 +0300
commit62e2353a0bd9f12885e51cb66eaf320d7dcb403a (patch)
tree51562781281ac3519691a6687c7070297e48f283 /Dockerfile.master
parentb2742008939468d091cfd5782bab90a1c87d52a8 (diff)
Move gitlab-docs project to gitlab-org
Diffstat (limited to 'Dockerfile.master')
-rw-r--r--Dockerfile.master10
1 files changed, 5 insertions, 5 deletions
diff --git a/Dockerfile.master b/Dockerfile.master
index dc0b3516..872f82ed 100644
--- a/Dockerfile.master
+++ b/Dockerfile.master
@@ -1,5 +1,5 @@
# First use the bootstrap image to build master
-FROM registry.gitlab.com/gitlab-com/gitlab-docs:bootstrap as builder
+FROM registry.gitlab.com/gitlab-org/gitlab-docs:bootstrap as builder
# Set up needed environment variables that are called with --build-arg when
# the Docker image is built (see .gitlab-ci.yml).
@@ -25,15 +25,15 @@ ENV TARGET=/usr/share/nginx/html
# Get the nginx config from the nginx-onbuild image
# This hardly ever changes so should usually be cached
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:nginx-onbuild /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
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 --from=registry.gitlab.com/gitlab-com/gitlab-docs:12.0 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.11 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.10 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.0 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.11 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.10 ${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