summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/docker/using_docker_build.md2
-rw-r--r--doc/ci/docker/using_kaniko.md2
-rw-r--r--doc/ci/introduction/index.md6
-rw-r--r--doc/ci/jenkins/index.md4
-rw-r--r--doc/ci/triggers/README.md2
-rw-r--r--doc/ci/variables/predefined_variables.md2
6 files changed, 9 insertions, 9 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index a48da557e09..eb549230889 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -515,7 +515,7 @@ If you're running multiple Runners you will have to modify all configuration fil
> login to GitLab's Container Registry.
Once you've built a Docker image, you can push it up to the built-in
-[GitLab Container Registry](../../user/project/container_registry.md).
+[GitLab Container Registry](../../user/package_registry/container_registry/index.md).
Some things you should be aware of:
- You must [log in to the container registry](#authenticating-to-the-container-registry)
diff --git a/doc/ci/docker/using_kaniko.md b/doc/ci/docker/using_kaniko.md
index 925653f9fdf..be42420575d 100644
--- a/doc/ci/docker/using_kaniko.md
+++ b/doc/ci/docker/using_kaniko.md
@@ -43,7 +43,7 @@ few important details:
In the following example, kaniko is used to:
1. Build a Docker image.
-1. Then push it to [GitLab Container Registry](../../user/project/container_registry.md).
+1. Then push it to [GitLab Container Registry](../../user/package_registry/container_registry/index.md).
The job will run only when a tag is pushed. A `config.json` file is created under
`/kaniko/.docker` with the needed GitLab Container Registry credentials taken from the
diff --git a/doc/ci/introduction/index.md b/doc/ci/introduction/index.md
index 366aca3442e..831f2171fad 100644
--- a/doc/ci/introduction/index.md
+++ b/doc/ci/introduction/index.md
@@ -187,9 +187,9 @@ according to each stage (Verify, Package, Release).
- Perform a series of tests, such as [Container Scanning](../../user/application_security/container_scanning/index.md) **(ULTIMATE)**, [Dependency Scanning](../../user/application_security/dependency_scanning/index.md) **(ULTIMATE)**, and [JUnit tests](../junit_test_reports.md).
- Deploy your changes with [Review Apps](../review_apps/index.md) to preview the app changes on every branch.
1. **Package**:
- - Store Docker images with [Container Registry](../../user/project/container_registry.md).
- - Store NPM packages with [NPM Registry](../../user/project/packages/npm_registry.md). **(PREMIUM)**
- - Store Maven artifacts with [Maven Repository](../../user/project/packages/maven_repository.md). **(PREMIUM)**
+ - Store Docker images with [Container Registry](../../user/package_registry/container_registry/index.md).
+ - Store NPM packages with [NPM Registry](../../user/package_registry/npm_registry/index.md). **(PREMIUM)**
+ - Store Maven artifacts with [Maven Repository](../../user/package_registry/maven_repository/index.md). **(PREMIUM)**
1. **Release**:
- Continuous Deployment, automatically deploying your app to production.
- Continuous Delivery, manually click to deploy your app to production.
diff --git a/doc/ci/jenkins/index.md b/doc/ci/jenkins/index.md
index ace1204511e..cba119cf48e 100644
--- a/doc/ci/jenkins/index.md
+++ b/doc/ci/jenkins/index.md
@@ -27,7 +27,7 @@ There are some high level differences between the products worth mentioning:
- The `.gitlab-ci.yml` file is checked in to the root of your repository, much like a Jenkinsfile, but
is in the YAML format (see [complete reference](../yaml/README.md)) instead of a Groovy DSL. It's most
analagous to the declarative Jenkinsfile format.
-- GitLab comes with a [container registry](../../user/project/container_registry.md), and we recommend using
+- GitLab comes with a [container registry](../../user/package_registry/container_registry/index.md), and we recommend using
container images to set up your build environment.
## Groovy vs. YAML
@@ -209,7 +209,7 @@ Because GitLab is integrated tightly with git, SCM polling options for triggers
GitLab does not support a separate `tools` directive. Our best-practice reccomendation is to use pre-built
container images, which can be cached, and can be built to already contain the tools you need for your pipelines. Pipelines can
-be set up to automatically build these images as needed and deploy them to the [container registry](../../user/project/container_registry.md).
+be set up to automatically build these images as needed and deploy them to the [container registry](../../user/package_registry/container_registry/index.md).
If you're not using container images with Docker/Kubernetes, for example on Mac or FreeBSD, then the `shell` executor does require you to
set up your environment either in advance or as part of the jobs. You could create a `before_script`
diff --git a/doc/ci/triggers/README.md b/doc/ci/triggers/README.md
index f62a4660713..0501d99a2d0 100644
--- a/doc/ci/triggers/README.md
+++ b/doc/ci/triggers/README.md
@@ -277,6 +277,6 @@ removed with one of the future versions of GitLab.
[ee]: https://about.gitlab.com/pricing/
[variables]: ../variables/README.md
[predef]: ../variables/README.md#predefined-environment-variables
-[registry]: ../../user/project/container_registry.md
+[registry]: ../../user/package_registry/container_registry/index.md
[permissions]: ../../user/permissions.md#job-permissions
[trigapi]: ../../api/pipeline_triggers.md
diff --git a/doc/ci/variables/predefined_variables.md b/doc/ci/variables/predefined_variables.md
index 409f7d62538..116ae7606cb 100644
--- a/doc/ci/variables/predefined_variables.md
+++ b/doc/ci/variables/predefined_variables.md
@@ -119,5 +119,5 @@ future GitLab releases.**
| `GITLAB_FEATURES` | 10.6 | all | The comma separated list of licensed features available for your instance and plan |
[gitlab-deploy-token]: ../../user/project/deploy_tokens/index.md#gitlab-deploy-token
-[registry]: ../../user/project/container_registry.md
+[registry]: ../../user/package_registry/container_registry/index.md
[dependent-repositories]: ../../user/project/new_ci_build_permissions_model.md#dependent-repositories