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

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-11-29 21:12:41 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-11-29 21:12:41 +0300
commit2d239d2421eea466ff5c51aebdbf05a18ded20c7 (patch)
tree85f9c0b6063158ff01112b9945f57bc35bd47970 /doc/ci/cloud_deployment
parent762918f04a2ee8f4f7fac3d551c14af8dd30f17c (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/cloud_deployment')
-rw-r--r--doc/ci/cloud_deployment/ecs/deploy_to_aws_ecs.md6
-rw-r--r--doc/ci/cloud_deployment/index.md4
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/ci/cloud_deployment/ecs/deploy_to_aws_ecs.md b/doc/ci/cloud_deployment/ecs/deploy_to_aws_ecs.md
index 2a73184eb7f..4ccf8e5d276 100644
--- a/doc/ci/cloud_deployment/ecs/deploy_to_aws_ecs.md
+++ b/doc/ci/cloud_deployment/ecs/deploy_to_aws_ecs.md
@@ -56,7 +56,7 @@ bare-bones application built on some well-known frameworks.
Now that you created a demo project, you must containerize the application and push it to the
container registry.
-### Push a containerized application image to GitLab Container Registry
+### Push a containerized application image to GitLab container registry
[ECS](https://aws.amazon.com/ecs/) is a container orchestration service, meaning that you must
provide a containerized application image during the infrastructure build. To do so, you can use
@@ -75,7 +75,7 @@ and [Container Registry](../../../user/packages/container_registry/index.md).
```
1. Select **Commit Changes**. It automatically triggers a new pipeline. In this pipeline, the `build`
- job containerizes the application and pushes the image to [GitLab Container Registry](../../../user/packages/container_registry/index.md).
+ job containerizes the application and pushes the image to [GitLab container registry](../../../user/packages/container_registry/index.md).
![Create project](img/initial-pipeline.png)
@@ -106,7 +106,7 @@ is a specification about how the application image is started by an [ECS service
1. Select **Container Definitions > Add container**. This opens a container registration form.
1. Set `web` to **Container name**.
1. Set `registry.gitlab.com/<your-namespace>/ecs-demo/master:latest` to **Image**.
- Alternatively, you can copy and paste the image path from the [GitLab Container Registry page](#push-a-containerized-application-image-to-gitlab-container-registry).
+ Alternatively, you can copy and paste the image path from the [GitLab container registry page](#push-a-containerized-application-image-to-gitlab-container-registry).
![Create project](img/container-name.png)
diff --git a/doc/ci/cloud_deployment/index.md b/doc/ci/cloud_deployment/index.md
index 16bfced9c34..0d601e2a4a8 100644
--- a/doc/ci/cloud_deployment/index.md
+++ b/doc/ci/cloud_deployment/index.md
@@ -61,7 +61,7 @@ deploy:
GitLab provides a Docker image that includes the AWS CLI:
-- Images are hosted in the GitLab Container Registry. The latest image is
+- Images are hosted in the GitLab container registry. The latest image is
`registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest`.
- [Images are stored in a GitLab repository](https://gitlab.com/gitlab-org/cloud-deploy/-/tree/master/aws).
@@ -120,7 +120,7 @@ To deploy to your ECS cluster:
1. Commit and push your updated `.gitlab-ci.yml` to your project's repository.
-Your application Docker image is rebuilt and pushed to the GitLab Container Registry.
+Your application Docker image is rebuilt and pushed to the GitLab container registry.
If your image is located in a private registry, make sure your task definition is
[configured with a `repositoryCredentials` attribute](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/private-auth.html).