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 /dockerfiles
parentb2742008939468d091cfd5782bab90a1c87d52a8 (diff)
Move gitlab-docs project to gitlab-org
Diffstat (limited to 'dockerfiles')
-rw-r--r--dockerfiles/Dockerfile.archives40
-rw-r--r--dockerfiles/Dockerfile.builder.onbuild2
-rw-r--r--dockerfiles/Dockerfile.gitlab-docs-lint2
-rw-r--r--dockerfiles/Dockerfile.single8
-rw-r--r--dockerfiles/README.md12
5 files changed, 32 insertions, 32 deletions
diff --git a/dockerfiles/Dockerfile.archives b/dockerfiles/Dockerfile.archives
index 8f90be9d..34e0a017 100644
--- a/dockerfiles/Dockerfile.archives
+++ b/dockerfiles/Dockerfile.archives
@@ -4,28 +4,28 @@ 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
# Get all the archive static HTML and put it into place
-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-com/gitlab-docs:11.9 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.8 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.7 ${TARGET} ${TARGET}
-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}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.2 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.1 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.0 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.8 ${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.6 ${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.4 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.3 ${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}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.9 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.8 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.7 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.6 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.5 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.4 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.3 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.2 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.1 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.0 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.8 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.7 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.6 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.5 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.4 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:10.3 ${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;'
diff --git a/dockerfiles/Dockerfile.builder.onbuild b/dockerfiles/Dockerfile.builder.onbuild
index 30934883..418d4c29 100644
--- a/dockerfiles/Dockerfile.builder.onbuild
+++ b/dockerfiles/Dockerfile.builder.onbuild
@@ -1,5 +1,5 @@
# Get Nanoc bootstrap
-FROM registry.gitlab.com/gitlab-com/gitlab-docs:bootstrap
+FROM registry.gitlab.com/gitlab-org/gitlab-docs:bootstrap
# Make the variables of the archive Dockerfiles accessible to this build-stage
ONBUILD ARG VER
diff --git a/dockerfiles/Dockerfile.gitlab-docs-lint b/dockerfiles/Dockerfile.gitlab-docs-lint
index 376d08ac..6e4edfca 100644
--- a/dockerfiles/Dockerfile.gitlab-docs-lint
+++ b/dockerfiles/Dockerfile.gitlab-docs-lint
@@ -11,7 +11,7 @@ RUN apk update && apk upgrade && apk add --no-cache \
RUN yarn global add markdownlint-cli && yarn cache clean
-RUN wget https://gitlab.com/gitlab-com/gitlab-docs/-/archive/$CI_COMMIT_REF_NAME/gitlab-docs-$CI_COMMIT_REF_NAME.tar.bz2 \
+RUN wget https://gitlab.com/gitlab-org/gitlab-docs/-/archive/$CI_COMMIT_REF_NAME/gitlab-docs-$CI_COMMIT_REF_NAME.tar.bz2 \
&& tar xvjf gitlab-docs-$CI_COMMIT_REF_NAME.tar.bz2 \
&& mv gitlab-docs-$CI_COMMIT_REF_NAME gitlab-docs \
&& rm gitlab-docs-$CI_COMMIT_REF_NAME.tar.bz2
diff --git a/dockerfiles/Dockerfile.single b/dockerfiles/Dockerfile.single
index 2a6a635b..a30cb445 100644
--- a/dockerfiles/Dockerfile.single
+++ b/dockerfiles/Dockerfile.single
@@ -13,11 +13,11 @@ ARG BRANCH_RUNNER=X-Y-stable
ARG BRANCH_CHARTS=W-Z-stable
# This image comes from the Dockerfile.builder.onbuild file
-# https://gitlab.com/gitlab-com/gitlab-docs/blob/master/dockerfiles/Dockerfile.builder.onbuild
+# https://gitlab.com/gitlab-org/gitlab-docs/blob/master/dockerfiles/Dockerfile.builder.onbuild
# Build the website
-FROM registry.gitlab.com/gitlab-com/gitlab-docs:builder-onbuild AS builder
+FROM registry.gitlab.com/gitlab-org/gitlab-docs:builder-onbuild AS builder
# This image comes from the Dockerfile.nginx.onbuild file
-# https://gitlab.com/gitlab-com/gitlab-docs/blob/master/dockerfiles/Dockerfile.nginx.onbuild
+# https://gitlab.com/gitlab-org/gitlab-docs/blob/master/dockerfiles/Dockerfile.nginx.onbuild
# Copy the generated HTML files to a smaller image
-FROM registry.gitlab.com/gitlab-com/gitlab-docs:nginx-onbuild
+FROM registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild
diff --git a/dockerfiles/README.md b/dockerfiles/README.md
index ca3fe52f..7100e8c3 100644
--- a/dockerfiles/README.md
+++ b/dockerfiles/README.md
@@ -32,9 +32,9 @@ The following Dockerfiles are used.
You can build and tag all tooling images locally (while in this directory):
```sh
-docker build -t registry.gitlab.com/gitlab-com/gitlab-docs:bootstrap -f Dockerfile.bootstrap ../
-docker build -t registry.gitlab.com/gitlab-com/gitlab-docs:builder-onbuild -f Dockerfile.builder.onbuild ../
-docker build -t registry.gitlab.com/gitlab-com/gitlab-docs:nginx-onbuild -f Dockerfile.nginx.onbuild ../
+docker build -t registry.gitlab.com/gitlab-org/gitlab-docs:bootstrap -f Dockerfile.bootstrap ../
+docker build -t registry.gitlab.com/gitlab-org/gitlab-docs:builder-onbuild -f Dockerfile.builder.onbuild ../
+docker build -t registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild -f Dockerfile.nginx.onbuild ../
```
For each image, there's a manual job under the `images` stage in
@@ -91,7 +91,7 @@ Docker images:
1. [`Dockerfile.master`](../Dockerfile.master) - Rotate the versions (oldest
gets removed and latest is added at the end of the list).
-Once you push, you may need to [run the scheduled pipeline](https://gitlab.com/gitlab-com/gitlab-docs/pipeline_schedules)
+Once you push, you may need to [run the scheduled pipeline](https://gitlab.com/gitlab-org/gitlab-docs/pipeline_schedules)
(press the play button), since both of those images are built on a schedule,
once an hour.
@@ -119,7 +119,7 @@ page work as expected. If not, the `latest` image is possibly not yet updated.
### 5. Add the new offline version in the 404 page redirect script
Since we're deprecating the oldest version each month, we need to redirect
-those URLs in order not to create [404 entries](https://gitlab.com/gitlab-com/gitlab-docs/issues/221).
+those URLs in order not to create [404 entries](https://gitlab.com/gitlab-org/gitlab-docs/issues/221).
There's a temporary hack for now:
1. Edit [`content/404.html`](../content/404.html)
@@ -129,7 +129,7 @@ There's a temporary hack for now:
## Update an old image with new upstream content
If there are upstream changes not included in the single Docker image, just
-[rerun the pipeline](https://gitlab.com/gitlab-com/gitlab-docs/pipelines/new)
+[rerun the pipeline](https://gitlab.com/gitlab-org/gitlab-docs/pipelines/new)
for the branch in question.
## Porting new website changes to old versions